2 files changed, 1 insertions(+), 8 deletions(-)

M src/main/java/eu/siacs/conversations/parser/MessageParser.java
M src/main/java/eu/siacs/conversations/services/MessageArchiveService.java

@@ 817,12 817,6 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                 }
             }
 
-            long deletionDate = mXmppConnectionService.getAutomaticMessageDeletionDate();
-            if (deletionDate != 0 && message.getTimeSent() < deletionDate) {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": skipping message from " + message.getCounterpart().toString() + " because it was sent prior to our deletion date");
-                return;
-            }
-
             boolean checkForDuplicates = (isTypeGroupChat && packet.hasChild("delay", "urn:xmpp:delay"))
                     || message.isPrivateMessage()
                     || message.getServerMsgId() != null

@@ 110,7 110,6 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
                 mXmppConnectionService.databaseBackend.getLastMessageReceived(account),
                 mXmppConnectionService.databaseBackend.getLastClearDate(account)
         );
-        mamReference = MamReference.max(mamReference, mXmppConnectionService.getAutomaticMessageDeletionDate());
         long endCatchup = account.getXmppConnection().getLastSessionEstablished();
         final Query query;
         if (mamReference.getTimestamp() == 0) {


@@ 184,7 183,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
     public Query query(Conversation conversation, MamReference start, long end, boolean allowCatchup) {
         synchronized (this.queries) {
             final Query query;
-            final MamReference startActual = MamReference.max(start, mXmppConnectionService.getAutomaticMessageDeletionDate());
+            final MamReference startActual = start;
             if (start.getTimestamp() == 0) {
                 query = new Query(conversation, startActual, end, false);
                 query.reference = conversation.getFirstMamReference();