do mam query after join

1 files changed, 3 insertions, 1 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index dfd7d112..8326766e 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1510,7 +1510,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					if (conversation.getMucOptions().mamSupport()) {
 						// Use MAM instead of the limited muc history to get history
 						x.addChild("history").setAttribute("maxchars", "0");
-						getMessageArchiveService().catchupMUC(conversation);
 					} else {
 						// Fallback to muc history
 						x.addChild("history").setAttribute("since", PresenceGenerator.getTimestamp(conversation.getLastMessageTransmitted()));
@@ -1527,6 +1526,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						databaseBackend.updateConversation(conversation);
 					}
 					conversation.setHasMessagesLeftOnServer(false);
+					if (conversation.getMucOptions().mamSupport()) {
+						getMessageArchiveService().catchupMUC(conversation);
+					}
 				}
 			});