diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 9ace7c18e..aa8618adb 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -3630,9 +3630,15 @@ public class XmppConnectionService extends Service {
 	}
 
 	public void clearConversationHistory(final Conversation conversation) {
+		long clearDate;
+		if (conversation.countMessages() > 0) {
+			clearDate = conversation.getLatestMessage().getTimeSent() + 1000;
+		} else {
+			clearDate = System.currentTimeMillis();
+		}
 		conversation.clearMessages();
 		conversation.setHasMessagesLeftOnServer(false); //avoid messages getting loaded through mam
-		conversation.setLastClearHistory(System.currentTimeMillis());
+		conversation.setLastClearHistory(clearDate);
 		Runnable runnable = new Runnable() {
 			@Override
 			public void run() {