diff --git a/packages/react/src/views/Message/Message.styles.js b/packages/react/src/views/Message/Message.styles.js
index 5cdf33366..03236addb 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 016bbb0b0..7fdf1b0b8 100644
--- a/packages/react/src/views/Message/MessageAvatarContainer.js
+++ b/packages/react/src/views/Message/MessageAvatarContainer.js
@@ -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" />