From efd0ca9dd0569db2da2dfea7734f421ff923c72b Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 23 Nov 2017 20:36:46 +0100
Subject: MAM: start muc catchup with last sent message if serverId is
 available

---
 src/main/java/de/pixart/messenger/entities/Conversation.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index 4a9a77a19..59611713b 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -874,7 +874,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         synchronized (this.messages) {
             for (int i = this.messages.size() - 1; i >= 0; --i) {
                 Message message = this.messages.get(i);
-                if (message.getStatus() == Message.STATUS_RECEIVED || message.isCarbon()) {
+                if (message.getStatus() == Message.STATUS_RECEIVED || message.isCarbon() || message.getServerMsgId() != null) {
                     lastReceived = new MamReference(message.getTimeSent(),message.getServerMsgId());
                     break;
                 }
-- 
cgit v1.2.3