diff --git a/src/components/Chat/ChatList.tsx b/src/components/Chat/ChatList.tsx
index 9a750eb..3b8f717 100644
--- a/src/components/Chat/ChatList.tsx
+++ b/src/components/Chat/ChatList.tsx
@@ -237,6 +237,7 @@ export const ChatList = ({ initialMessages, myAddress, tempMessages, chatId, onR
                  if (chatReferences?.[reply?.signature]?.edit) {
                    reply.decryptedData = chatReferences[reply?.signature]?.edit;
                    reply.text = chatReferences[reply?.signature]?.edit?.message;
+                   reply.editTimestamp = chatReferences[reply?.signature]?.edit?.timestamp
                  }
                }
          
@@ -263,10 +264,12 @@ export const ChatList = ({ initialMessages, myAddress, tempMessages, chatId, onR
                  if (chatReferences[message.signature]?.edit?.message && message?.text) {
                    message.text = chatReferences[message.signature]?.edit?.message;
                    message.isEdit = true
+                   message.editTimestamp = chatReferences[message.signature]?.edit?.timestamp
                  }
                  if (chatReferences[message.signature]?.edit?.messageText && message?.messageText) {
                   message.messageText = chatReferences[message.signature]?.edit?.messageText;
                   message.isEdit = true
+                  message.editTimestamp = chatReferences[message.signature]?.edit?.timestamp
                 }
                
                }
diff --git a/src/components/Chat/MessageItem.tsx b/src/components/Chat/MessageItem.tsx
index 32f6ed5..f48ce7e 100644
--- a/src/components/Chat/MessageItem.tsx
+++ b/src/components/Chat/MessageItem.tsx
@@ -114,7 +114,7 @@ const htmlText = useMemo(()=> {
     ])
   }
   
-}, [])
+}, [message?.editTimestamp])
 
 
 
@@ -130,7 +130,7 @@ const htmlReply = useMemo(()=> {
     ])
   }
   
-}, [])
+}, [reply?.editTimestamp])
 
 const userAvatarUrl = useMemo(()=> {
   return message?.senderName ? `${getBaseApiReact()}/arbitrary/THUMBNAIL/${