Add thread decoration with latest event details (#5355)

* Add thread decoration with latest event details * Update screenshots --------- Co-authored-by: ElementBot <android@element.io>
2025-09-23 16:57:50 +02:00 · 2025-09-23 16:57:50 +02:00 · 0a5c178fe8
commit 0a5c178fe8
parent 5cadd37fa6
106 changed files with 554 additions and 282 deletions
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
@ -43,6 +43,7 @@ import io.element.android.features.messages.impl.timeline.components.customreact
 import io.element.android.features.messages.impl.timeline.components.reactionsummary.ReactionSummaryState
 import io.element.android.features.messages.impl.timeline.components.receipt.bottomsheet.ReadReceiptBottomSheetState
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContentWithAttachment
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemPollContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent
@ -328,7 +329,10 @@ class MessagesPresenter(
                val displayThreads = featureFlagService.isFeatureEnabled(FeatureFlags.Threads)
                if (displayThreads) {
                    // Get either the thread id this event is in, or the event id if it's not in a thread so we can start one
-                    val threadId = targetEvent.threadInfo.threadRootId ?: targetEvent.eventId!!.toThreadId()
+                    val threadId = when (targetEvent.threadInfo) {
+                        is TimelineItemThreadInfo.ThreadResponse -> targetEvent.threadInfo.threadRootId
+                        is TimelineItemThreadInfo.ThreadRoot, null -> targetEvent.eventId?.toThreadId()
+                    } ?: return@launch
                    navigator.onOpenThread(threadId, null)
                } else {
                    handleActionReply(targetEvent, composerState, timelineProtectionState)
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt
@ -25,6 +25,7 @@ import io.element.android.features.messages.impl.actionlist.model.TimelineItemAc
 import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUserSendFailure
 import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUserSendFailureFactory
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContentWithAttachment
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
@ -174,7 +175,7 @@ class DefaultActionListPresenter(
                    add(TimelineItemAction.ReplyInThread)
                    add(TimelineItemAction.Reply)
                } else {
-                    if (!isThreadsEnabled && timelineItem.threadInfo.threadRootId != null) {
+                    if (!isThreadsEnabled && timelineItem.threadInfo is TimelineItemThreadInfo.ThreadResponse) {
                        // If threads are not enabled, we can reply in a thread if the item is already in the thread
                        add(TimelineItemAction.ReplyInThread)
                    } else {
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt
@ -16,6 +16,7 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
 import io.element.android.features.messages.impl.timeline.model.TimelineItemReactions
 import io.element.android.features.messages.impl.timeline.model.TimelineItemReadReceipts
+import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
 import io.element.android.features.messages.impl.timeline.model.anAggregatedReaction
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemStateEventContent
@ -32,7 +33,6 @@ import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.tombstone.PredecessorRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
-import io.element.android.libraries.matrix.api.timeline.item.EventThreadInfo
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageShield
@ -146,7 +146,7 @@ internal fun aTimelineItemEvent(
    groupPosition: TimelineItemGroupPosition = TimelineItemGroupPosition.None,
    sendState: LocalEventSendState? = null,
    inReplyTo: InReplyToDetails? = null,
-    threadInfo: EventThreadInfo = EventThreadInfo(threadRootId = null, threadSummary = null),
+    threadInfo: TimelineItemThreadInfo? = null,
    debugInfo: TimelineItemDebugInfo = aTimelineItemDebugInfo(),
    timelineItemReactions: TimelineItemReactions = aTimelineItemReactions(),
    readReceiptState: TimelineItemReadReceipts = aTimelineItemReadReceipts(),
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt
@ -53,8 +53,6 @@ import io.element.android.libraries.ui.utils.time.isTalkbackActive
 private val BUBBLE_RADIUS = 12.dp
 private val avatarRadius = AvatarSize.TimelineSender.dp / 2

-// Design says: The maximum width of a bubble is still 3/4 of the screen width. But try with 78% now.
-private const val BUBBLE_WIDTH_RATIO = 0.78f
 private val MIN_BUBBLE_WIDTH = 80.dp

@Composable
@ -66,34 +64,6 @@ fun MessageEventBubble(
    modifier: Modifier = Modifier,
    content: @Composable BoxScope.() -> Unit = {},
 ) {
-    fun bubbleShape(): Shape {
-        val topLeftCorner = if (state.cutTopStart) 0.dp else BUBBLE_RADIUS
-        return when (state.groupPosition) {
-            TimelineItemGroupPosition.First -> if (state.isMine) {
-                RoundedCornerShape(BUBBLE_RADIUS, BUBBLE_RADIUS, 0.dp, BUBBLE_RADIUS)
-            } else {
-                RoundedCornerShape(topLeftCorner, BUBBLE_RADIUS, BUBBLE_RADIUS, 0.dp)
-            }
-            TimelineItemGroupPosition.Middle -> if (state.isMine) {
-                RoundedCornerShape(BUBBLE_RADIUS, 0.dp, 0.dp, BUBBLE_RADIUS)
-            } else {
-                RoundedCornerShape(0.dp, BUBBLE_RADIUS, BUBBLE_RADIUS, 0.dp)
-            }
-            TimelineItemGroupPosition.Last -> if (state.isMine) {
-                RoundedCornerShape(BUBBLE_RADIUS, 0.dp, BUBBLE_RADIUS, BUBBLE_RADIUS)
-            } else {
-                RoundedCornerShape(0.dp, BUBBLE_RADIUS, BUBBLE_RADIUS, BUBBLE_RADIUS)
-            }
-            TimelineItemGroupPosition.None ->
-                RoundedCornerShape(
-                    topLeftCorner,
-                    BUBBLE_RADIUS,
-                    BUBBLE_RADIUS,
-                    BUBBLE_RADIUS
-                )
-        }
-    }
-
    val clickableModifier = if (isTalkbackActive()) {
        Modifier
    } else {
@ -108,11 +78,8 @@ fun MessageEventBubble(
    }

    // Ignore state.isHighlighted for now, we need a design decision on it.
-    val backgroundBubbleColor = when {
-        state.isMine -> ElementTheme.colors.messageFromMeBackground
-        else -> ElementTheme.colors.messageFromOtherBackground
-    }
-    val bubbleShape = bubbleShape()
+    val backgroundBubbleColor = MessageEventBubbleDefaults.backgroundBubbleColor(state.isMine)
+    val bubbleShape = remember(state) { MessageEventBubbleDefaults.shape(state.cutTopStart, state.groupPosition, state.isMine) }
    val radiusPx = (avatarRadius + SENDER_AVATAR_BORDER_WIDTH).toPx()
    val yOffsetPx = -(NEGATIVE_MARGIN_FOR_BUBBLE + avatarRadius).toPx()
    val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
@ -147,7 +114,7 @@ fun MessageEventBubble(
                .testTag(TestTags.messageBubble)
                .widthIn(
                    min = MIN_BUBBLE_WIDTH,
-                    max = (constraints.maxWidth * BUBBLE_WIDTH_RATIO)
+                    max = (constraints.maxWidth * MessageEventBubbleDefaults.BUBBLE_WIDTH_RATIO)
                        .toInt()
                        .toDp()
                )
@ -157,6 +124,48 @@ fun MessageEventBubble(
    }
 }

+object MessageEventBubbleDefaults {
+    fun shape(cutTopStart: Boolean, groupPosition: TimelineItemGroupPosition, isMine: Boolean): Shape {
+        val topLeftCorner = if (cutTopStart) 0.dp else BUBBLE_RADIUS
+        return when (groupPosition) {
+            TimelineItemGroupPosition.First -> if (isMine) {
+                RoundedCornerShape(BUBBLE_RADIUS, BUBBLE_RADIUS, 0.dp, BUBBLE_RADIUS)
+            } else {
+                RoundedCornerShape(topLeftCorner, BUBBLE_RADIUS, BUBBLE_RADIUS, 0.dp)
+            }
+            TimelineItemGroupPosition.Middle -> if (isMine) {
+                RoundedCornerShape(BUBBLE_RADIUS, 0.dp, 0.dp, BUBBLE_RADIUS)
+            } else {
+                RoundedCornerShape(0.dp, BUBBLE_RADIUS, BUBBLE_RADIUS, 0.dp)
+            }
+            TimelineItemGroupPosition.Last -> if (isMine) {
+                RoundedCornerShape(BUBBLE_RADIUS, 0.dp, BUBBLE_RADIUS, BUBBLE_RADIUS)
+            } else {
+                RoundedCornerShape(0.dp, BUBBLE_RADIUS, BUBBLE_RADIUS, BUBBLE_RADIUS)
+            }
+            TimelineItemGroupPosition.None ->
+                RoundedCornerShape(
+                    topLeftCorner,
+                    BUBBLE_RADIUS,
+                    BUBBLE_RADIUS,
+                    BUBBLE_RADIUS
+                )
+        }
+    }
+
+    @Composable
+    fun backgroundBubbleColor(isMine: Boolean): Color {
+        return if (isMine) {
+            ElementTheme.colors.messageFromMeBackground
+        } else {
+            ElementTheme.colors.messageFromOtherBackground
+        }
+    }
+
+    // Design says: The maximum width of a bubble is still 3/4 of the screen width. But try with 78% now.
+    const val BUBBLE_WIDTH_RATIO = 0.78f
+}
+
@PreviewsDayNight
@Composable
 internal fun MessageEventBubblePreview(@PreviewParameter(BubbleStateProvider::class) state: BubbleState) = ElementPreview {
--- 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
@ -15,6 +15,7 @@ import androidx.compose.foundation.gestures.draggable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@ -23,6 +24,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
@ -34,6 +37,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalViewConfiguration
 import androidx.compose.ui.platform.ViewConfiguration
 import androidx.compose.ui.res.pluralStringResource
@ -43,6 +47,7 @@ import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.isTraversalGroup
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.traversalIndex
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
@ -61,6 +66,7 @@ import io.element.android.features.messages.impl.timeline.components.receipt.Rea
 import io.element.android.features.messages.impl.timeline.components.receipt.TimelineItemReadReceiptView
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
+import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
 import io.element.android.features.messages.impl.timeline.model.bubble.BubbleState
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
@ -78,25 +84,28 @@ import io.element.android.libraries.designsystem.colors.AvatarColorsProvider
 import io.element.android.libraries.designsystem.components.EqualWidthColumn
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
+import io.element.android.libraries.designsystem.modifiers.niceClickable
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.swipe.SwipeableActionsState
 import io.element.android.libraries.designsystem.swipe.rememberSwipeableActionsState
 import io.element.android.libraries.designsystem.text.toPx
-import io.element.android.libraries.designsystem.theme.components.Button
-import io.element.android.libraries.designsystem.theme.components.ButtonSize
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.core.toThreadId
 import io.element.android.libraries.matrix.api.timeline.Timeline
-import io.element.android.libraries.matrix.api.timeline.item.EventThreadInfo
+import io.element.android.libraries.matrix.api.timeline.item.EmbeddedEventInfo
 import io.element.android.libraries.matrix.api.timeline.item.ThreadSummary
+import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
+import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.getAvatarUrl
+import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName
 import io.element.android.libraries.matrix.api.timeline.item.event.getDisplayName
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
@ -256,22 +265,22 @@ fun TimelineItemEventRow(
            )
        }

-        if (displayThreadSummaries && timelineMode !is Timeline.Mode.Thread) {
-            event.threadInfo.threadSummary?.let { threadSummary ->
-                val threadPart = stringResource(CommonStrings.common_thread)
-                val numberOfReplies = threadSummary.numberOfReplies.toInt().let { replies ->
-                    pluralStringResource(CommonPlurals.common_replies, replies, replies)
+        if (displayThreadSummaries && timelineMode !is Timeline.Mode.Thread && event.threadInfo is TimelineItemThreadInfo.ThreadRoot) {
+            ThreadSummaryView(
+                modifier = if (event.isMine) {
+                    Modifier.align(Alignment.End).padding(end = 16.dp)
+                } else {
+                    if (timelineRoomInfo.isDm) Modifier else Modifier.padding(start = 16.dp)
+                }.padding(top = 2.dp),
+                threadSummary = event.threadInfo.summary,
+                latestEventText = event.threadInfo.latestEventText,
+                isOutgoing = event.isMine,
+                onClick = {
+                    event.eventId?.let {
+                        eventSink(TimelineEvents.OpenThread(it.toThreadId(), null))
+                    }
                }
-                Button(
-                    modifier = Modifier.padding(horizontal = 24.dp, vertical = 2.dp)
-                        .align(if (event.isMine) Alignment.End else Alignment.Start),
-                    text = "$threadPart - $numberOfReplies",
-                    size = ButtonSize.Small,
-                    onClick = {
-                        eventSink(TimelineEvents.OpenThread(event.eventId!!.toThreadId(), null))
-                    },
-                )
-            }
+            )
        }

        // Read receipts / Send state
@ -288,6 +297,79 @@ fun TimelineItemEventRow(
    }
 }

+@Composable
+private fun ThreadSummaryView(
+    threadSummary: ThreadSummary,
+    latestEventText: String?,
+    isOutgoing: Boolean,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    BoxWithConstraints(modifier = modifier) {
+        Row(
+            modifier = Modifier
+                .then(if (!isOutgoing) Modifier.padding(start = 16.dp) else Modifier)
+                .graphicsLayer {
+                    shape = RoundedCornerShape(8.dp)
+                    clip = true
+                }
+                .background(MessageEventBubbleDefaults.backgroundBubbleColor(isOutgoing))
+                .niceClickable(onClick)
+                .padding(horizontal = 12.dp, vertical = 10.dp)
+                .widthIn(max = (maxWidth - 24.dp) * MessageEventBubbleDefaults.BUBBLE_WIDTH_RATIO),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                modifier = Modifier.size(20.dp),
+                imageVector = CompoundIcons.ThreadsSolid(),
+                contentDescription = null,
+                tint = ElementTheme.colors.iconSecondary,
+            )
+            Spacer(modifier = Modifier.width(4.dp))
+            Text(
+                text = pluralStringResource(CommonPlurals.common_replies, threadSummary.numberOfReplies.toInt(), threadSummary.numberOfReplies),
+                style = ElementTheme.typography.fontBodySmMedium,
+                color = ElementTheme.colors.textSecondary,
+            )
+
+            Spacer(modifier = Modifier.width(8.dp))
+
+            threadSummary.latestEvent.dataOrNull()?.let { latestEvent ->
+                val avatarData = AvatarData(
+                    id = latestEvent.senderId.value,
+                    name = latestEvent.senderProfile.getDisplayName(),
+                    url = latestEvent.senderProfile.getAvatarUrl(),
+                    size = AvatarSize.TimelineThreadLatestEventSender,
+                )
+                Avatar(
+                    avatarData = avatarData,
+                    avatarType = AvatarType.User,
+                )
+
+                Spacer(modifier = Modifier.width(8.dp))
+
+                Text(
+                    text = latestEvent.senderProfile.getDisambiguatedDisplayName(latestEvent.senderId),
+                    style = ElementTheme.typography.fontBodySmMedium,
+                    color = ElementTheme.colors.textSecondary,
+                )
+
+                Spacer(modifier = Modifier.width(4.dp))
+
+                latestEventText?.let {
+                    Text(
+                        text = it,
+                        style = ElementTheme.typography.fontBodySmRegular,
+                        color = ElementTheme.colors.textSecondary,
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1,
+                    )
+                }
+            }
+        }
+    }
+}
+
 /**
 * Impact ViewConfiguration.touchSlop by [sensitivityFactor].
 * Inspired from https://issuetracker.google.com/u/1/issues/269627294.
@ -694,7 +776,7 @@ private fun MessageEventBubbleContent(
        else -> ContentPadding.Textual
    }
    CommonLayout(
-        showThreadDecoration = timelineMode !is Timeline.Mode.Thread && event.threadInfo.threadRootId != null,
+        showThreadDecoration = timelineMode !is Timeline.Mode.Thread && event.threadInfo is TimelineItemThreadInfo.ThreadResponse,
        timestampPosition = timestampPosition,
        paddingBehaviour = paddingBehaviour,
        inReplyToDetails = event.inReplyTo,
@ -746,9 +828,27 @@ internal fun TimelineItemEventRowWithThreadSummaryPreview() = ElementPreview {
                            " hopefully can be manually adjusted to test different behaviors."
                    ),
                    groupPosition = TimelineItemGroupPosition.First,
-                    threadInfo = EventThreadInfo(
-                        threadRootId = ThreadId("\$thread-root-id"),
-                        threadSummary = ThreadSummary(AsyncData.Uninitialized, numberOfReplies = 20L)
+                    threadInfo = TimelineItemThreadInfo.ThreadRoot(
+                        latestEventText = "This is the latest message in the thread",
+                        summary = ThreadSummary(AsyncData.Success(
+                            EmbeddedEventInfo(
+                                eventOrTransactionId = EventOrTransactionId.Event(EventId("\$event-id")),
+                                content = MessageContent(
+                                    body = "This is the latest message in the thread",
+                                    inReplyTo = null,
+                                    isEdited = false,
+                                    threadInfo = null,
+                                    type = TextMessageType("This is the latest message in the thread", null)
+                                ),
+                                senderId = UserId("@user:id"),
+                                senderProfile = ProfileTimelineDetails.Ready(
+                                    displayName = "Alice",
+                                    avatarUrl = null,
+                                    displayNameAmbiguous = false,
+                                ),
+                                timestamp = 0L,
+                            )
+                        ), numberOfReplies = 20L)
                    )
                ),
                displayThreadSummaries = true,
@ -756,3 +856,40 @@ internal fun TimelineItemEventRowWithThreadSummaryPreview() = ElementPreview {
        }
    }
 }
+
+@PreviewsDayNight
+@Composable
+internal fun ThreadSummaryViewPreview() {
+    ElementPreview {
+        val body = "This is the latest message in the thread"
+        val threadSummary = ThreadSummary(
+            AsyncData.Success(
+                EmbeddedEventInfo(
+                    eventOrTransactionId = EventOrTransactionId.Event(EventId("\$event-id")),
+                    content = MessageContent(
+                        body = body,
+                        inReplyTo = null,
+                        isEdited = false,
+                        threadInfo = null,
+                        type = TextMessageType(body, null)
+                    ),
+                    senderId = UserId("@user:id"),
+                    senderProfile = ProfileTimelineDetails.Ready(
+                        displayName = "Alice",
+                        avatarUrl = null,
+                        displayNameAmbiguous = true,
+                    ),
+                    timestamp = 0L,
+                )
+            ),
+            numberOfReplies = 12,
+        )
+
+        ThreadSummaryView(
+            threadSummary = threadSummary,
+            latestEventText = "Some event with a very long text that should get clipped",
+            isOutgoing = true,
+            onClick = {},
+        )
+    }
+}
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyPreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyPreview.kt
@ -13,12 +13,12 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
 import io.element.android.features.messages.impl.timeline.aTimelineItemReactions
 import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
+import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.matrix.api.core.ThreadId
-import io.element.android.libraries.matrix.api.timeline.item.EventThreadInfo
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetailsProvider

@ -58,10 +58,7 @@ internal fun TimelineItemEventRowWithReplyContentToPreview(
                    ),
                    inReplyTo = inReplyToDetails,
                    displayNameAmbiguous = displayNameAmbiguous,
-                    threadInfo = EventThreadInfo(
-                        threadRootId = ThreadId("\$thread-root-id"),
-                        threadSummary = null,
-                    ),
+                    threadInfo = TimelineItemThreadInfo.ThreadResponse(threadRootId = ThreadId("\$thread-root-id")),
                    groupPosition = TimelineItemGroupPosition.Last,
                ),
            )
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt
@ -12,7 +12,10 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRtcNotificationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.CallNotifyContent
+import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
 import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
@ -20,6 +23,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.LegacyCallInv
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileChangeContent
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
 import io.element.android.libraries.matrix.api.timeline.item.event.RoomMembershipContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StateContent
@ -27,6 +31,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.StickerConten
 import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecryptContent
 import io.element.android.libraries.matrix.api.timeline.item.event.UnknownContent
 import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName
+import io.element.android.libraries.matrix.api.user.CurrentSessionIdHolder

@Inject
 class TimelineItemContentFactory(
@ -40,26 +45,53 @@ class TimelineItemContentFactory(
    private val stateFactory: TimelineItemContentStateFactory,
    private val failedToParseMessageFactory: TimelineItemContentFailedToParseMessageFactory,
    private val failedToParseStateFactory: TimelineItemContentFailedToParseStateFactory,
+    private val currentSessionIdHolder: CurrentSessionIdHolder,
 ) {
    suspend fun create(eventTimelineItem: EventTimelineItem): TimelineItemEventContent {
-        return when (val itemContent = eventTimelineItem.content) {
+        return create(
+            itemContent = eventTimelineItem.content,
+            eventId = eventTimelineItem.eventId,
+            isEditable = eventTimelineItem.isEditable,
+            sender = eventTimelineItem.sender,
+            senderProfile = eventTimelineItem.senderProfile,
+        )
+    }
+
+    suspend fun create(
+        itemContent: EventContent,
+        eventId: EventId?,
+        isEditable: Boolean,
+        sender: UserId,
+        senderProfile: ProfileTimelineDetails,
+    ): TimelineItemEventContent {
+        val isOutgoing = currentSessionIdHolder.current == sender
+        return when (itemContent) {
            is FailedToParseMessageLikeContent -> failedToParseMessageFactory.create(itemContent)
            is FailedToParseStateContent -> failedToParseStateFactory.create(itemContent)
            is MessageContent -> {
-                val senderDisambiguatedDisplayName = eventTimelineItem.senderProfile.getDisambiguatedDisplayName(eventTimelineItem.sender)
+                val senderDisambiguatedDisplayName = senderProfile.getDisambiguatedDisplayName(sender)
                messageFactory.create(
                    content = itemContent,
                    senderDisambiguatedDisplayName = senderDisambiguatedDisplayName,
-                    eventId = eventTimelineItem.eventId,
+                    eventId = eventId,
                )
            }
-            is ProfileChangeContent -> profileChangeFactory.create(eventTimelineItem)
+            is ProfileChangeContent -> {
+                val senderDisambiguatedDisplayName = senderProfile.getDisambiguatedDisplayName(sender)
+                profileChangeFactory.create(itemContent, isOutgoing, sender, senderDisambiguatedDisplayName)
+            }
            is RedactedContent -> redactedMessageFactory.create(itemContent)
-            is RoomMembershipContent -> roomMembershipFactory.create(eventTimelineItem)
+            is RoomMembershipContent -> {
+                val senderDisambiguatedDisplayName = senderProfile.getDisambiguatedDisplayName(sender)
+                roomMembershipFactory.create(itemContent, isOutgoing, sender, senderDisambiguatedDisplayName)
+            }
            is LegacyCallInviteContent -> TimelineItemLegacyCallInviteContent
-            is StateContent -> stateFactory.create(eventTimelineItem)
+            is StateContent -> {
+                val senderDisambiguatedDisplayName = senderProfile.getDisambiguatedDisplayName(sender)
+                stateFactory.create(itemContent, isOutgoing, sender, senderDisambiguatedDisplayName)
+            }
            is StickerContent -> stickerFactory.create(itemContent)
-            is PollContent -> pollFactory.create(eventTimelineItem, itemContent)
+            is PollContent -> pollFactory.create(eventId, isEditable, isOutgoing, itemContent)
            is UnableToDecryptContent -> utdFactory.create(itemContent)
            is CallNotifyContent -> TimelineItemRtcNotificationContent()
            is UnknownContent -> TimelineItemUnknownContent
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentPollFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentPollFactory.kt
@ -11,7 +11,7 @@ import dev.zacsweers.metro.Inject
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemPollContent
 import io.element.android.features.poll.api.pollcontent.PollContentStateFactory
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
+import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent

@Inject
@ -19,14 +19,16 @@ class TimelineItemContentPollFactory(
    private val pollContentStateFactory: PollContentStateFactory,
 ) {
    suspend fun create(
-        event: EventTimelineItem,
+        eventId: EventId?,
+        isEditable: Boolean,
+        isOwn: Boolean,
        content: PollContent,
    ): TimelineItemEventContent {
-        val pollContentState = pollContentStateFactory.create(event, content)
+        val pollContentState = pollContentStateFactory.create(eventId, isEditable, isOwn, content)
        return TimelineItemPollContent(
            isMine = pollContentState.isMine,
            isEditable = pollContentState.isPollEditable,
-            eventId = event.eventId,
+            eventId = eventId,
            question = pollContentState.question,
            answerItems = pollContentState.answerItems,
            pollKind = pollContentState.pollKind,
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentProfileChangeFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentProfileChangeFactory.kt
@ -12,14 +12,15 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemProfileChangeContent
 import io.element.android.libraries.core.extensions.orEmpty
 import io.element.android.libraries.eventformatter.api.TimelineEventFormatter
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.timeline.item.event.EventContent

@Inject
 class TimelineItemContentProfileChangeFactory(
    private val timelineEventFormatter: TimelineEventFormatter,
 ) {
-    fun create(eventTimelineItem: EventTimelineItem): TimelineItemEventContent {
-        val text = timelineEventFormatter.format(eventTimelineItem)
+    fun create(content: EventContent, isOutgoing: Boolean, sender: UserId, senderDisambiguatedDisplayName: String): TimelineItemEventContent {
+        val text = timelineEventFormatter.format(content, isOutgoing, sender, senderDisambiguatedDisplayName)
        return TimelineItemProfileChangeContent(text.orEmpty().toString())
    }
 }
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRoomMembershipFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRoomMembershipFactory.kt
@ -12,14 +12,15 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRoomMembershipContent
 import io.element.android.libraries.core.extensions.orEmpty
 import io.element.android.libraries.eventformatter.api.TimelineEventFormatter
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.timeline.item.event.EventContent

@Inject
 class TimelineItemContentRoomMembershipFactory(
    private val timelineEventFormatter: TimelineEventFormatter,
 ) {
-    fun create(eventTimelineItem: EventTimelineItem): TimelineItemEventContent {
-        val text = timelineEventFormatter.format(eventTimelineItem)
+    fun create(eventContent: EventContent, isOutgoing: Boolean, sender: UserId, senderDisambiguatedDisplayName: String): TimelineItemEventContent {
+        val text = timelineEventFormatter.format(eventContent, isOutgoing, sender, senderDisambiguatedDisplayName)
        return TimelineItemRoomMembershipContent(text.orEmpty().toString())
    }
 }
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentStateFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentStateFactory.kt
@ -12,14 +12,15 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateEventContent
 import io.element.android.libraries.core.extensions.orEmpty
 import io.element.android.libraries.eventformatter.api.TimelineEventFormatter
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.timeline.item.event.EventContent

@Inject
 class TimelineItemContentStateFactory(
    private val timelineEventFormatter: TimelineEventFormatter,
 ) {
-    fun create(eventTimelineItem: EventTimelineItem): TimelineItemEventContent {
-        val text = timelineEventFormatter.format(eventTimelineItem)
+    fun create(eventContent: EventContent, isOutgoing: Boolean, sender: UserId, senderDisambiguatedDisplayName: String): TimelineItemEventContent {
+        val text = timelineEventFormatter.format(eventContent, isOutgoing, sender, senderDisambiguatedDisplayName)
        return TimelineItemStateEventContent(text.orEmpty().toString())
    }
 }
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemEventFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemEventFactory.kt
@ -19,6 +19,9 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
 import io.element.android.features.messages.impl.timeline.model.TimelineItemReactions
 import io.element.android.features.messages.impl.timeline.model.TimelineItemReadReceipts
+import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
+import io.element.android.features.messages.impl.utils.messagesummary.MessageSummaryFormatter
+import io.element.android.libraries.architecture.map
 import io.element.android.libraries.core.bool.orTrue
 import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.api.DateFormatterMode
@ -43,6 +46,7 @@ class TimelineItemEventFactory(
    private val matrixClient: MatrixClient,
    private val dateFormatter: DateFormatter,
    private val permalinkParser: PermalinkParser,
+    private val summaryFormatter: MessageSummaryFormatter,
 ) {
    @AssistedFactory
    interface Creator {
@ -69,6 +73,29 @@ class TimelineItemEventFactory(
            url = senderProfile.getAvatarUrl(),
            size = AvatarSize.TimelineSender
        )
+        val mappedThreadInfo = when (val threadInfo = currentTimelineItem.event.threadInfo()) {
+            is EventThreadInfo.ThreadResponse -> {
+                TimelineItemThreadInfo.ThreadResponse(threadInfo.threadRootId)
+            }
+            is EventThreadInfo.ThreadRoot -> {
+                TimelineItemThreadInfo.ThreadRoot(
+                    summary = threadInfo.summary,
+                    latestEventText = threadInfo.summary.latestEvent.dataOrNull()
+                        ?.let {
+                            contentFactory.create(
+                                itemContent = it.content,
+                                eventId = it.eventOrTransactionId.eventId,
+                                isEditable = false,
+                                sender = it.senderId,
+                                senderProfile = it.senderProfile,
+                            )
+                        }
+                        ?.let(summaryFormatter::format)
+                )
+            }
+            null -> null
+        }
+
        return TimelineItem.Event(
            id = currentTimelineItem.uniqueId,
            eventId = currentTimelineItem.eventId,
@ -87,7 +114,7 @@ class TimelineItemEventFactory(
            readReceiptState = currentTimelineItem.computeReadReceiptState(roomMembers),
            localSendState = currentTimelineItem.event.localSendState,
            inReplyTo = currentTimelineItem.event.inReplyTo()?.map(permalinkParser = permalinkParser),
-            threadInfo = currentTimelineItem.event.threadInfo() ?: EventThreadInfo(threadRootId = null, threadSummary = null),
+            threadInfo = mappedThreadInfo,
            origin = currentTimelineItem.event.origin,
            timelineItemDebugInfoProvider = currentTimelineItem.event.timelineItemDebugInfoProvider,
            messageShieldProvider = currentTimelineItem.event.messageShieldProvider,
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt
@ -17,10 +17,11 @@ import io.element.android.features.messages.impl.timeline.model.virtual.Timeline
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.SendHandle
+import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.TransactionId
 import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.timeline.item.EventThreadInfo
+import io.element.android.libraries.matrix.api.timeline.item.ThreadSummary
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
@ -82,7 +83,7 @@ sealed interface TimelineItem {
        val readReceiptState: TimelineItemReadReceipts,
        val localSendState: LocalEventSendState?,
        val inReplyTo: InReplyToDetails?,
-        val threadInfo: EventThreadInfo,
+        val threadInfo: TimelineItemThreadInfo?,
        val origin: TimelineItemEventOrigin?,
        val timelineItemDebugInfoProvider: TimelineItemDebugInfoProvider,
        val messageShieldProvider: MessageShieldProvider,
@ -130,3 +131,8 @@ sealed interface TimelineItem {
        val aggregatedReadReceipts: ImmutableList<ReadReceiptData>,
    ) : TimelineItem
 }
+
+sealed interface TimelineItemThreadInfo {
+    data class ThreadRoot(val summary: ThreadSummary, val latestEventText: String?) : TimelineItemThreadInfo
+    data class ThreadResponse(val threadRootId: ThreadId) : TimelineItemThreadInfo
+}
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt
@ -10,9 +10,9 @@ package io.element.android.features.messages.impl.utils.messagesummary
 import android.content.Context
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.Inject
-import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEncryptedContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
@ -37,15 +37,15 @@ import io.element.android.libraries.ui.strings.CommonStrings
 class DefaultMessageSummaryFormatter(
    @ApplicationContext private val context: Context,
 ) : MessageSummaryFormatter {
-    override fun format(event: TimelineItem.Event): String {
-        return when (event.content) {
-            is TimelineItemTextBasedContent -> event.content.plainText
-            is TimelineItemProfileChangeContent -> event.content.body
-            is TimelineItemStateContent -> event.content.body
+    override fun format(content: TimelineItemEventContent): String {
+        return when (content) {
+            is TimelineItemTextBasedContent -> content.plainText
+            is TimelineItemProfileChangeContent -> content.body
+            is TimelineItemStateContent -> content.body
            is TimelineItemLocationContent -> context.getString(CommonStrings.common_shared_location)
            is TimelineItemEncryptedContent -> context.getString(CommonStrings.common_unable_to_decrypt)
            is TimelineItemRedactedContent -> context.getString(CommonStrings.common_message_removed)
-            is TimelineItemPollContent -> event.content.question
+            is TimelineItemPollContent -> content.question
            is TimelineItemVoiceContent -> context.getString(CommonStrings.common_voice_message)
            is TimelineItemUnknownContent -> context.getString(CommonStrings.common_unsupported_event)
            is TimelineItemImageContent -> context.getString(CommonStrings.common_image)
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/MessageSummaryFormatter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/MessageSummaryFormatter.kt
@ -8,7 +8,11 @@
 package io.element.android.features.messages.impl.utils.messagesummary

 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent

 interface MessageSummaryFormatter {
-    fun format(event: TimelineItem.Event): String
+    fun format(event: TimelineItem.Event): String {
+        return format(event.content)
+    }
+    fun format(content: TimelineItemEventContent): String
 }
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt
@ -26,6 +26,7 @@ import io.element.android.features.messages.impl.pinned.banner.aLoadedPinnedMess
 import io.element.android.features.messages.impl.timeline.TimelineController
 import io.element.android.features.messages.impl.timeline.TimelineEvents
 import io.element.android.features.messages.impl.timeline.aTimelineState
+import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent
@ -61,7 +62,6 @@ import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.room.tombstone.SuccessorRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
-import io.element.android.libraries.matrix.api.timeline.item.EventThreadInfo
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId
@ -1181,7 +1181,7 @@ class MessagesPresenterTest {
            val initialState = awaitItem()
            initialState.eventSink(MessagesEvents.HandleAction(
                action = TimelineItemAction.ReplyInThread,
-                event = aMessageEvent(threadInfo = EventThreadInfo(A_THREAD_ID, null))
+                event = aMessageEvent(threadInfo = TimelineItemThreadInfo.ThreadResponse(A_THREAD_ID))
            ))
            awaitItem()
            openThreadLambda.assertions().isCalledOnce().with(value(A_THREAD_ID), value(null))
@ -1204,7 +1204,7 @@ class MessagesPresenterTest {
                event = aMessageEvent(
                    // The event id will be used as the thread id instead
                    eventId = AN_EVENT_ID,
-                    threadInfo = EventThreadInfo(null, null),
+                    threadInfo = null,
                )
            ))
            awaitItem()
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt
@ -18,6 +18,7 @@ import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUser
 import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUserSendFailureFactory
 import io.element.android.features.messages.impl.fixtures.aMessageEvent
 import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
+import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRtcNotificationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent
@ -31,7 +32,6 @@ import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
-import io.element.android.libraries.matrix.api.timeline.item.EventThreadInfo
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_CAPTION
@ -198,7 +198,7 @@ class ActionListPresenterTest {
            val messageEvent = aMessageEvent(
                isMine = false,
                isEditable = false,
-                threadInfo = EventThreadInfo(threadRootId = A_THREAD_ID, threadSummary = null),
+                threadInfo = TimelineItemThreadInfo.ThreadResponse(threadRootId = A_THREAD_ID),
                content = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, isEdited = false, formattedBody = A_MESSAGE)
            )
            initialState.eventSink.invoke(
@ -432,7 +432,7 @@ class ActionListPresenterTest {
            val initialState = awaitItem()
            val messageEvent = aMessageEvent(
                isMine = true,
-                threadInfo = EventThreadInfo(threadRootId = A_THREAD_ID, threadSummary = null),
+                threadInfo = TimelineItemThreadInfo.ThreadResponse(threadRootId = A_THREAD_ID),
                content = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, isEdited = false, formattedBody = A_MESSAGE)
            )
            initialState.eventSink.invoke(
@ -1264,7 +1264,7 @@ class ActionListPresenterTest {
                content = aTimelineItemVoiceContent(
                    caption = null,
                ),
-                threadInfo = EventThreadInfo(A_THREAD_ID, null)
+                threadInfo = TimelineItemThreadInfo.ThreadResponse(threadRootId = A_THREAD_ID)
            )
            initialState.eventSink.invoke(
                ActionListEvents.ComputeForMessage(
@ -1368,7 +1368,7 @@ class ActionListPresenterTest {
                content = aTimelineItemVoiceContent(
                    caption = null,
                ),
-                threadInfo = EventThreadInfo(A_THREAD_ID, null),
+                threadInfo = TimelineItemThreadInfo.ThreadResponse(threadRootId = A_THREAD_ID),
            )

            assertThat(messageEvent.isRemote).isTrue()
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/MessageEventFixtures.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/MessageEventFixtures.kt
@ -12,6 +12,7 @@ import io.element.android.features.messages.impl.timeline.aTimelineItemReactions
 import io.element.android.features.messages.impl.timeline.model.ReadReceiptData
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.TimelineItemReadReceipts
+import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
@ -19,7 +20,6 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.TransactionId
 import io.element.android.libraries.matrix.api.core.UniqueId
-import io.element.android.libraries.matrix.api.timeline.item.EventThreadInfo
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageShieldProvider
 import io.element.android.libraries.matrix.api.timeline.item.event.SendHandleProvider
@ -41,7 +41,7 @@ internal fun aMessageEvent(
    canBeRepliedTo: Boolean = true,
    content: TimelineItemEventContent = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, formattedBody = A_MESSAGE, isEdited = false),
    inReplyTo: InReplyToDetails? = null,
-    threadInfo: EventThreadInfo = EventThreadInfo(threadRootId = null, threadSummary = null),
+    threadInfo: TimelineItemThreadInfo? = null,
    sendState: LocalEventSendState = LocalEventSendState.Sent(AN_EVENT_ID),
    debugInfoProvider: TimelineItemDebugInfoProvider = TimelineItemDebugInfoProvider { aTimelineItemDebugInfo() },
    messageShieldProvider: MessageShieldProvider = MessageShieldProvider { null },
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt
@ -7,6 +7,7 @@

 package io.element.android.features.messages.impl.fixtures

+import io.element.android.features.messages.impl.messagesummary.FakeMessageSummaryFormatter
 import io.element.android.features.messages.impl.timeline.factories.TimelineItemsFactory
 import io.element.android.features.messages.impl.timeline.factories.TimelineItemsFactoryConfig
 import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentFactory
@ -30,7 +31,9 @@ import io.element.android.features.poll.test.pollcontent.FakePollContentStateFac
 import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
 import io.element.android.libraries.eventformatter.api.TimelineEventFormatter
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
+import io.element.android.libraries.matrix.api.user.CurrentSessionIdHolder
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
 import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractorWithoutValidation
@ -75,11 +78,13 @@ internal fun TestScope.aTimelineItemsFactory(
                        stateFactory = TimelineItemContentStateFactory(timelineEventFormatter),
                        failedToParseMessageFactory = TimelineItemContentFailedToParseMessageFactory(),
                        failedToParseStateFactory = TimelineItemContentFailedToParseStateFactory(),
+                        currentSessionIdHolder = CurrentSessionIdHolder(matrixClient),
                    ),
                    matrixClient = matrixClient,
                    dateFormatter = FakeDateFormatter(),
                    permalinkParser = FakePermalinkParser(),
-                    config = config
+                    config = config,
+                    summaryFormatter = FakeMessageSummaryFormatter(),
                )
            }
        },
@ -95,7 +100,7 @@ internal fun TestScope.aTimelineItemsFactory(

 internal fun aTimelineEventFormatter(): TimelineEventFormatter {
    return object : TimelineEventFormatter {
-        override fun format(event: EventTimelineItem): CharSequence {
+        override fun format(content: EventContent, isOutgoing: Boolean, sender: UserId, senderDisambiguatedDisplayName: String): CharSequence? {
            return ""
        }
    }
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagesummary/FakeMessageSummaryFormatter.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagesummary/FakeMessageSummaryFormatter.kt
@ -7,13 +7,13 @@

 package io.element.android.features.messages.impl.messagesummary

-import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.utils.messagesummary.MessageSummaryFormatter

 class FakeMessageSummaryFormatter : MessageSummaryFormatter {
    private var result = "A message"

-    override fun format(event: TimelineItem.Event): String = result
+    override fun format(content: TimelineItemEventContent): String = result

    fun givenMessageResult(value: String) {
        result = value
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt
@ -750,7 +750,7 @@ class TimelineItemContentMessageFactoryTest {
        body: String = "Body",
        inReplyTo: InReplyTo? = null,
        isEdited: Boolean = false,
-        threadInfo: EventThreadInfo = EventThreadInfo(threadRootId = null, threadSummary = null),
+        threadInfo: EventThreadInfo? = null,
        type: MessageType,
    ): MessageContent {
        return MessageContent(
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouperTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouperTest.kt
@ -18,7 +18,6 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.model.virtual.aTimelineItemDaySeparatorModel
 import io.element.android.libraries.designsystem.components.avatar.anAvatarData
 import io.element.android.libraries.matrix.api.core.UniqueId
-import io.element.android.libraries.matrix.api.timeline.item.EventThreadInfo
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
@ -42,7 +41,7 @@ class TimelineItemGrouperTest {
        isEditable = false,
        canBeRepliedTo = false,
        inReplyTo = null,
-        threadInfo = EventThreadInfo(threadRootId = null, threadSummary = null),
+        threadInfo = null,
        origin = null,
        timelineItemDebugInfoProvider = { aTimelineItemDebugInfo() },
        messageShieldProvider = { null },
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFactory.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFactory.kt
@ -7,9 +7,18 @@

 package io.element.android.features.poll.api.pollcontent

+import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent

 interface PollContentStateFactory {
-    suspend fun create(event: EventTimelineItem, content: PollContent): PollContentState
+    suspend fun create(eventTimelineItem: EventTimelineItem, content: PollContent): PollContentState {
+        return create(
+            eventId = eventTimelineItem.eventId,
+            isEditable = eventTimelineItem.isEditable,
+            isOwn = eventTimelineItem.isOwn,
+            content = content,
+        )
+    }
+    suspend fun create(eventId: EventId?, isEditable: Boolean, isOwn: Boolean, content: PollContent): PollContentState
 }
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItemsFactory.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItemsFactory.kt
@ -45,7 +45,12 @@ class PollHistoryItemsFactory(
        return when (timelineItem) {
            is MatrixTimelineItem.Event -> {
                val pollContent = timelineItem.event.content as? PollContent ?: return null
-                val pollContentState = pollContentStateFactory.create(timelineItem.event, pollContent)
+                val pollContentState = pollContentStateFactory.create(
+                    eventId = timelineItem.eventId,
+                    isEditable = timelineItem.event.isEditable,
+                    isOwn = timelineItem.event.isOwn,
+                    content = pollContent,
+                )
                PollHistoryItem(
                    formattedDate = dateFormatter.format(
                        timestamp = timelineItem.event.timestamp,
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/model/DefaultPollContentStateFactory.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/model/DefaultPollContentStateFactory.kt
@ -14,8 +14,8 @@ import io.element.android.features.poll.api.pollcontent.PollContentState
 import io.element.android.features.poll.api.pollcontent.PollContentStateFactory
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.poll.isDisclosed
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
 import kotlinx.collections.immutable.toImmutableList

@ -25,8 +25,10 @@ class DefaultPollContentStateFactory(
    private val matrixClient: MatrixClient,
 ) : PollContentStateFactory {
    override suspend fun create(
-        event: EventTimelineItem,
-        content: PollContent
+        eventId: EventId?,
+        isEditable: Boolean,
+        isOwn: Boolean,
+        content: PollContent,
    ): PollContentState {
        val totalVoteCount = content.votes.flatMap { it.value }.size
        val myVotes = content.votes.filter { matrixClient.sessionId in it.value }.keys
@ -59,13 +61,13 @@ class DefaultPollContentStateFactory(
        }

        return PollContentState(
-            eventId = event.eventId,
+            eventId = eventId,
            question = content.question,
            answerItems = answerItems.toImmutableList(),
            pollKind = content.kind,
-            isPollEditable = event.isEditable,
+            isPollEditable = isEditable,
            isPollEnded = isPollEnded,
-            isMine = event.isOwn,
+            isMine = isOwn,
        )
    }
 }
--- a/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/pollcontent/FakePollContentStateFactory.kt
+++ b/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/pollcontent/FakePollContentStateFactory.kt
@ -10,20 +10,20 @@ package io.element.android.features.poll.test.pollcontent
 import io.element.android.features.poll.api.pollcontent.PollAnswerItem
 import io.element.android.features.poll.api.pollcontent.PollContentState
 import io.element.android.features.poll.api.pollcontent.PollContentStateFactory
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
+import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
 import kotlinx.collections.immutable.toImmutableList

 class FakePollContentStateFactory : PollContentStateFactory {
-    override suspend fun create(event: EventTimelineItem, content: PollContent): PollContentState {
+    override suspend fun create(eventId: EventId?, isEditable: Boolean, isOwn: Boolean, content: PollContent): PollContentState {
        return PollContentState(
-            eventId = event.eventId,
+            eventId = eventId,
            question = content.question,
            answerItems = emptyList<PollAnswerItem>().toImmutableList(),
            pollKind = content.kind,
-            isPollEditable = event.isEditable,
+            isPollEditable = isEditable,
            isPollEnded = content.endTime != null,
-            isMine = event.isOwn
+            isMine = isOwn,
        )
    }
 }