diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
index 66651f3f8..a2f2d632d 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -144,9 +145,9 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, accoun
 
             Spacer(modifier = Modifier.height(10.dp))
 
-            val replyingNote = replyTo.value
-            if (replyingNote != null) {
-                Row(Modifier.padding(horizontal = 10.dp), verticalAlignment = Alignment.CenterVertically) {
+            Row(Modifier.padding(horizontal = 10.dp).animateContentSize(), verticalAlignment = Alignment.CenterVertically) {
+                val replyingNote = replyTo.value
+                if (replyingNote != null) {
                     Column(Modifier.weight(1f)) {
                         ChatroomMessageCompose(
                             baseNote = replyingNote,
@@ -177,7 +178,7 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, accoun
             }
 
             //LAST ROW
-            Row(modifier = Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp).fillMaxWidth(),
+            Row(modifier = Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp, top= 5.dp).fillMaxWidth(),
                 horizontalArrangement = Arrangement.SpaceBetween,
                 verticalAlignment = Alignment.CenterVertically
             ) {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
index 547f17819..e329b9d3d 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -120,9 +121,9 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr
 
             Spacer(modifier = Modifier.height(10.dp))
 
-            val replyingNote = replyTo.value
-            if (replyingNote != null) {
-                Row(Modifier.padding(horizontal = 10.dp), verticalAlignment = Alignment.CenterVertically) {
+            Row(Modifier.padding(horizontal = 10.dp).animateContentSize(), verticalAlignment = Alignment.CenterVertically) {
+                val replyingNote = replyTo.value
+                if (replyingNote != null) {
                     Column(Modifier.weight(1f)) {
                         ChatroomMessageCompose(
                             baseNote = replyingNote,