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 9d3d24d27..1401404a0 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -2666,11 +2666,10 @@ class ChatActivity :
             chatMessage.activeUser = conversationUser
 
             adapter?.let {
-                chatMessage.isGrouped = (
-                    it.isPreviousSameAuthor(chatMessage.actorId, -1) &&
-                        it.getSameAuthorLastMessagesCount(chatMessage.actorId) %
-                        GROUPED_MESSAGES_SAME_AUTHOR_THRESHOLD > 0
-                    )
+                val lastItemIndex = adapter!!.itemCount - 1
+                val previousChatMessage = adapter!!.items[lastItemIndex].item as ChatMessage
+                chatMessage.isGrouped = groupMessages(chatMessage, previousChatMessage)
+
                 chatMessage.isOneToOneConversation =
                     (currentConversation?.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL)
                 chatMessage.isFormerOneToOneConversation =
@@ -2716,19 +2715,9 @@ class ChatActivity :
     }
 
     private fun processMessagesNotFromTheFuture(chatMessageList: List<ChatMessage>) {
-        var countGroupedMessages = 0
-
         for (i in chatMessageList.indices) {
             if (chatMessageList.size > i + 1) {
-                if (isSameDayNonSystemMessages(chatMessageList[i], chatMessageList[i + 1]) &&
-                    chatMessageList[i + 1].actorId == chatMessageList[i].actorId &&
-                    countGroupedMessages < GROUPED_MESSAGES_THRESHOLD
-                ) {
-                    chatMessageList[i].isGrouped = true
-                    countGroupedMessages++
-                } else {
-                    countGroupedMessages = 0
-                }
+                chatMessageList[i].isGrouped = groupMessages(chatMessageList[i], chatMessageList[i + 1])
             }
 
             val chatMessage = chatMessageList[i]
@@ -2754,6 +2743,40 @@ class ChatActivity :
         }
     }
 
+    private fun groupMessages(message1: ChatMessage, message2: ChatMessage): Boolean {
+        val message1IsSystem = message1.systemMessage.isNotEmpty()
+        val message2IsSystem = message2.systemMessage.isNotEmpty()
+        if (message1IsSystem != message2IsSystem) {
+            return false
+        }
+
+        if (message1.actorType == "bots" && message1.actorId != "changelog") {
+            return false
+        }
+
+        if (!message1IsSystem && (
+                (message1.actorType != message2.actorType) ||
+                    (message2.actorId != message1.actorId)
+                )
+        ) {
+            return false
+        }
+
+        val timeDifference = dateUtils.getTimeDifferenceInSeconds(
+            message2.timestamp,
+            message1.timestamp
+        )
+        val isLessThan5Min = timeDifference > 300
+        if (isSameDayMessages(message2, message1) &&
+            (message2.actorId == message1.actorId) &&
+            (!isLessThan5Min) &&
+            (message2.lastEditTimestamp == 0L || message1.lastEditTimestamp == 0L)
+        ) {
+            return true
+        }
+        return false
+    }
+
     private fun determinePreviousMessageIds(chatMessageList: List<ChatMessage>) {
         var previousMessageId = NO_PREVIOUS_MESSAGE_ID
         for (i in chatMessageList.indices.reversed()) {
@@ -2840,6 +2863,10 @@ class ChatActivity :
             TextUtils.isEmpty(messageRight.systemMessage) &&
             DateFormatter.isSameDay(messageLeft.createdAt, messageRight.createdAt)
 
+    private fun isSameDayMessages(message1: ChatMessage, message2: ChatMessage): Boolean {
+        return DateFormatter.isSameDay(message1.createdAt, message2.createdAt)
+    }
+
     override fun onLoadMore(page: Int, totalItemsCount: Int) {
         val id = (
             adapter?.items?.last {
diff --git a/app/src/main/java/com/nextcloud/talk/utils/DateUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DateUtils.kt
index 29e1b8254..1d302d487 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/DateUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/DateUtils.kt
@@ -15,6 +15,7 @@ import com.nextcloud.talk.R
 import java.text.DateFormat
 import java.util.Calendar
 import java.util.Date
+import kotlin.math.abs
 import kotlin.math.roundToInt
 
 class DateUtils(val context: Context) {
@@ -50,6 +51,11 @@ class DateUtils(val context: Context) {
         return formatTime.format(Date(timestampSeconds * DateConstants.SECOND_DIVIDER))
     }
 
+    fun getTimeDifferenceInSeconds(time2: Long, time1: Long): Long {
+        val difference = (time2 - time1)
+        return abs(difference)
+    }
+
     fun relativeStartTimeForLobby(timestampMilliseconds: Long, resources: Resources): String {
         val fmt = RelativeDateTimeFormatter.getInstance()
         val timeLeftMillis = timestampMilliseconds - System.currentTimeMillis()