diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
index a814d8da42..c9bc130905 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
@@ -745,8 +745,8 @@ private fun MessageEventBubbleContent(
             } else {
                 inReplyToModifier.clickable(onClick = inReplyToClick)
             }
-            Row(
-                talkbackCompatModifier
+            Box(
+                modifier = talkbackCompatModifier
                     .border(1.dp, ElementTheme.colors.borderInteractiveSecondary, RoundedCornerShape(6.dp))
                     .background(ElementTheme.colors.bgCanvasDefault, RoundedCornerShape(6.dp))
                     .padding(4.dp)
@@ -843,7 +843,7 @@ internal fun TimelineItemEventRowWithThreadSummaryPreview() = ElementPreview {
                     threadInfo = TimelineItemThreadInfo.ThreadRoot(
                         latestEventText = "This is the latest message in the thread",
                         summary = ThreadSummary(
-                            AsyncData.Success(
+                            latestEvent = AsyncData.Success(
                                 EmbeddedEventInfo(
                                     eventOrTransactionId = EventOrTransactionId.Event(EventId("\$event-id")),
                                     content = MessageContent(
@@ -861,7 +861,8 @@ internal fun TimelineItemEventRowWithThreadSummaryPreview() = ElementPreview {
                                     ),
                                     timestamp = 0L,
                                 )
-                            ), numberOfReplies = 20L
+                            ),
+                            numberOfReplies = 20L,
                         )
                     )
                 ),
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ComposerModeView.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ComposerModeView.kt
index 3d7c4f810c..15aabdcbb0 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ComposerModeView.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ComposerModeView.kt
@@ -18,7 +18,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember