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 76380e403..b59fd349c 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -3759,7 +3759,13 @@ class ChatActivity : } private fun processMessagesFromTheFuture(chatMessageList: List) { - val insertNewMessagesNotice = (adapter?.itemCount ?: 0) > 0 && chatMessageList.isNotEmpty() + val newMessagesAvailable = (adapter?.itemCount ?: 0) > 0 && chatMessageList.isNotEmpty() + val insertNewMessagesNotice = if (newMessagesAvailable) { + chatMessageList.any { it.actorId != conversationUser!!.userId } + } else { + false + } + val scrollToEndOnUpdate = layoutManager?.findFirstVisibleItemPosition() == 0 if (insertNewMessagesNotice) {