diff --git a/app/src/main/java/com/nextcloud/talk/ui/chat/ChatMessageScaffold.kt b/app/src/main/java/com/nextcloud/talk/ui/chat/ChatMessageScaffold.kt
index cce52da287..f9ca121ce4 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/chat/ChatMessageScaffold.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/chat/ChatMessageScaffold.kt
@@ -127,13 +127,14 @@ private fun shouldShowTimeNextToContent(
     showQuote: Boolean
 ): Boolean {
     val containsLinebreak = message.message.contains("\n") || message.message.contains("\r")
-    val shouldHideTime = forceTimeBelow ||
+    val shouldShowTimeBelowContent = forceTimeBelow ||
         forceTimeOverlay ||
         message.hasMentionChips() ||
         showQuote ||
-        containsLinebreak
+        containsLinebreak ||
+        message.isEdited
 
-    return !shouldHideTime && (message.message.length < MESSAGE_LENGTH_THRESHOLD)
+    return !shouldShowTimeBelowContent && (message.message.length < MESSAGE_LENGTH_THRESHOLD)
 }
 
 private val mentionChipTypes = setOf("user", "guest", "call", "user-group", "email", "circle")