1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 8e71a028d..332b62b7b 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -216,6 +216,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
     }
 
     private void toggleScrollDownButton(AbsListView listView) {
+        if (conversation == null) {
+            return;
+        }
         if (scrolledToBottom(listView)) {
             lastMessageUuid = null;
             hideUnreadMessagesCount();