From 7f3e93edd4059f5a9ddf11eab2b4b28c56d60007 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Mon, 30 Sep 2019 12:32:59 +0200
Subject: [PATCH] Fix issues with messages processing

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../main/java/com/nextcloud/talk/controllers/ChatController.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 592bdfe73..4012ade08 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -1006,7 +1006,7 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
 
                 }
 
-                if (isFirstMessagesProcessing) {
+                if (wasFirstMessageProcessing && chatMessageList.size > 0) {
                     globalLastKnownFutureMessageId = chatMessageList[0].jsonMessageId
                 }