1 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 9005d8c3..f53d62d3 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -933,6 +933,10 @@ public class XmppConnectionService extends Service {
 	}
 
 	private void expireOldMessages() {
+		expireOldMessages(false);
+	}
+
+	public void expireOldMessages(final boolean resetHasMessagesLeftOnServer) {
 		mLastExpiryRun.set(SystemClock.elapsedRealtime());
 		mDatabaseExecutor.execute(new Runnable() {
 			@Override
@@ -943,6 +947,10 @@ public class XmppConnectionService extends Service {
 					synchronized (XmppConnectionService.this.conversations) {
 						for (Conversation conversation : XmppConnectionService.this.conversations) {
 							conversation.expireOldMessages(timestamp);
+							if (resetHasMessagesLeftOnServer) {
+								conversation.messagesLoaded.set(true);
+								conversation.setHasMessagesLeftOnServer(true);
+							}
 						}
 					}
 					updateConversationUi();