From b3059e4bb8ce0beedf8e31e2bcf624d0b8b19a35 Mon Sep 17 00:00:00 2001
From: Deepak Bhagat <deepak988088@gmail.com>
Date: Sat, 17 Jan 2026 21:56:06 +0530
Subject: [PATCH 1/2] fix: show edit icon for sequential messages

---
 packages/react/src/views/Message/Message.styles.js       | 6 ++++++
 .../react/src/views/Message/MessageAvatarContainer.js    | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/react/src/views/Message/Message.styles.js b/packages/react/src/views/Message/Message.styles.js
index 5cdf333662..03236addbd 100644
--- a/packages/react/src/views/Message/Message.styles.js
+++ b/packages/react/src/views/Message/Message.styles.js
@@ -230,6 +230,12 @@ export const getMessageHeaderStyles = (theme) => {
       flex-shrink: 0;
       margin-left: 0.25rem;
     `,
+    messageStatus: css`
+      display: flex;
+      flex-flow: row nowrap;
+      align-items: center;
+      margin-left: 0.2rem;
+    `,
   };
 
   return styles;
diff --git a/packages/react/src/views/Message/MessageAvatarContainer.js b/packages/react/src/views/Message/MessageAvatarContainer.js
index 016bbb0b06..b835bf558a 100644
--- a/packages/react/src/views/Message/MessageAvatarContainer.js
+++ b/packages/react/src/views/Message/MessageAvatarContainer.js
@@ -49,8 +49,8 @@ const MessageAvatarContainer = ({
                 ? '1.2em'
                 : '1.5em'
               : message.t
-              ? '1.5em'
-              : '2.25em'
+                ? '1.5em'
+                : '2.25em'
           }
           onClick={handleAvatarClick}
         />
@@ -60,6 +60,11 @@ const MessageAvatarContainer = ({
           <Icon style={{ opacity: 0.5 }} name="star-filled" size="1.2em" />
         </Tooltip>
       ) : null}
+      {message.editedAt && sequential ? (
+        <Tooltip text="Edited" position="top">
+          <Icon style={{ opacity: 0.5 }} name="edit" size="1.2em" />
+        </Tooltip>
+      ) : null}
       {isPinned && sequential ? (
         <Tooltip text="Pinned" position="top">
           <Icon style={{ opacity: 0.5 }} name="pin" size="1.2em" />

From 9dd9d0e5612a926a39777aed5c0127f09136ef26 Mon Sep 17 00:00:00 2001
From: Deepak Bhagat <deepak988088@gmail.com>
Date: Sat, 17 Jan 2026 22:05:35 +0530
Subject: [PATCH 2/2] style: fix formatting in MessageAvatarContainer

---
 packages/react/src/views/Message/MessageAvatarContainer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react/src/views/Message/MessageAvatarContainer.js b/packages/react/src/views/Message/MessageAvatarContainer.js
index b835bf558a..7fdf1b0b8a 100644
--- a/packages/react/src/views/Message/MessageAvatarContainer.js
+++ b/packages/react/src/views/Message/MessageAvatarContainer.js
@@ -49,8 +49,8 @@ const MessageAvatarContainer = ({
                 ? '1.2em'
                 : '1.5em'
               : message.t
-                ? '1.5em'
-                : '2.25em'
+              ? '1.5em'
+              : '2.25em'
           }
           onClick={handleAvatarClick}
         />