From 81aead26cc0cb7ba0d92382643a2ed6d595673df Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Tue, 19 May 2026 23:02:40 -0400
Subject: [PATCH] fix grouping logic

---
 lib/widgets/room_chat.dart | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/widgets/room_chat.dart b/lib/widgets/room_chat.dart
index 696642e..191cfcf 100644
--- a/lib/widgets/room_chat.dart
+++ b/lib/widgets/room_chat.dart
@@ -335,7 +335,7 @@ class RoomChat extends HookConsumerWidget {
                             itemCount: value.length,
                             itemBuilder: (_, index) {
                               final event = value[index];
-                              final previousEvent = value.getOrNull(index - 1);
+                              final previousEvent = value.getOrNull(index + 1);
                               return EventWrapper(
                                 event,
                                 EventRenderer(
@@ -364,8 +364,12 @@ class RoomChat extends HookConsumerWidget {
                                   },
                                   getEventOptions: getEventOptions,
                                   isGrouped:
+                                      previousEvent?.content
+                                          is MessageContent &&
+                                      event.redactedBy == null &&
+                                      event.relationType != "m.replace" &&
                                       "${event.sender}${event.pmp?.id}" ==
-                                      "${previousEvent?.sender}${previousEvent?.pmp?.id}",
+                                          "${previousEvent?.sender}${previousEvent?.pmp?.id}",
                                 ),
                                 isFlashing:
                                     flashingEvent.value == event.eventId,