diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index 499821afa..dfdd86104 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -920,6 +920,7 @@ class ChatActivity :
                         }
                     }
                     message.message = messageEdited.ocs?.data?.parentMessage?.text
+                    message.lastEditTimestamp = System.currentTimeMillis()
                     adapter?.update(message)
                     adapter?.notifyDataSetChanged()
 
@@ -3857,6 +3858,10 @@ class ChatActivity :
                 // delete poll system messages
                 chatMessageIterator.remove()
             } else if (isEditMessage(currentMessage)) {
+                if (!chatMessageMap.containsKey(currentMessage.value.parentMessage!!.id)) {
+                    setMessageAsEdited(currentMessage.value.parentMessage)
+                }
+
                 chatMessageIterator.remove()
             }
         }
@@ -4464,6 +4469,17 @@ class ChatActivity :
         adapter?.update(messageTemp)
     }
 
+    private fun setMessageAsEdited(message: IMessage?) {
+        val messageTemp = message as ChatMessage
+        messageTemp.lastEditTimestamp = message.timestamp
+
+        messageTemp.isOneToOneConversation =
+            currentConversation?.type == ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL
+        messageTemp.activeUser = conversationUser
+
+        adapter?.update(messageTemp)
+    }
+
     private fun updateAdapterForReaction(message: IMessage?) {
         val messageTemp = message as ChatMessage