1 files changed, 2 insertions, 8 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/mam/MessageArchiveService.java b/src/main/java/de/thedevstack/conversationsplus/services/mam/MessageArchiveService.java
index 6ad413b4..34620808 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/mam/MessageArchiveService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/mam/MessageArchiveService.java
@@ -15,6 +15,7 @@ import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.generator.AbstractGenerator;
+import de.thedevstack.conversationsplus.persistance.DatabaseBackend;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.OnAdvancedStreamFeaturesLoaded;
@@ -47,7 +48,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 				}
 			}
 		}
-		Pair<Long,String> pair = mXmppConnectionService.databaseBackend.getLastMessageReceived(account);
+		Pair<Long,String> pair = DatabaseBackend.getInstance().getLastMessageReceived(account);
 		long startCatchup = pair == null ? 0 : pair.first;
 		long endCatchup = account.getXmppConnection().getLastSessionEstablished();
 		final Query query;
@@ -168,14 +169,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 		}
 		final Conversation conversation = query.getConversation();
 		if (conversation != null) {
-			conversation.sort();
 			conversation.setHasMessagesLeftOnServer(!done);
-		} else {
-			for(Conversation tmp : this.mXmppConnectionService.getConversations()) {
-				if (tmp.getAccount() == query.getAccount()) {
-					tmp.sort();
-				}
-			}
 		}
 		if (query.hasCallback()) {
 			query.callback();