From aeb02ccc2a42881e02ab912c52452afd83e5bae7 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 9 Jul 2026 01:06:20 +0300
Subject: [PATCH] fix author change not breaking chains

---
 src/components/chat_message_list/chat_message_list.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/chat_message_list/chat_message_list.js b/src/components/chat_message_list/chat_message_list.js
index 1f709d0a1..b0c078819 100644
--- a/src/components/chat_message_list/chat_message_list.js
+++ b/src/components/chat_message_list/chat_message_list.js
@@ -69,7 +69,9 @@ const ChatMessageList = {
             if (newerItem.type === 'date') {
               chatItem.messageChainId = uniqueId()
             } else if (newerItem.type === 'message') {
-              if (newerItem.data.account_id !== message.account_id) {
+              const newerUser = newerItem.data.account_id || newerItem.data.user.id
+              const olderUser = message.account_id || message.user.id
+              if (newerUser !== olderUser) {
                 chatItem.messageChainId = uniqueId()
               } else {
                 chatItem.messageChainId = newerItem.messageChainId