1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 3e4962cdb..1feb40b1f 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1855,7 +1855,13 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         }
         int pos = binding.messagesView.getLastVisiblePosition();
         if (pos >= 0) {
-            Message message = (Message) binding.messagesView.getItemAtPosition(pos);
+            Message message = null;
+            for (int i = pos; i >= 0; --i) {
+                message = (Message) binding.messagesView.getItemAtPosition(i);
+                if (message.getType() != Message.TYPE_STATUS) {
+                    break;
+                }
+            }
             if (message != null) {
                 while (message.next() != null && message.next().wasMergedIntoPrevious()) {
                     message = message.next();