Fixed NPE while loading messages via MAM

1 files changed, 1 insertions, 1 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
index 4400105e..ddaaa844 100644
--- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
+++ b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
@@ -161,6 +161,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 		final Conversation conversation = query.getConversation();
 		if (conversation != null) {
 			conversation.sort();
+			conversation.setHasMessagesLeftOnServer(query.getMessageCount() > 0);
 		} else {
 			for(Conversation tmp : this.mXmppConnectionService.getConversations()) {
 				if (tmp.getAccount() == query.getAccount()) {
@@ -171,7 +172,6 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 		if (query.hasCallback()) {
 			query.callback();
 		} else {
-			conversation.setHasMessagesLeftOnServer(query.getMessageCount() > 0);
 			this.mXmppConnectionService.updateConversationUi();
 		}
 	}