1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java
index ec341eb37..b69b5312e 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -520,6 +520,12 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                 }
             }
 
+            long deletionDate = mXmppConnectionService.getAutomaticMessageDeletionDate();
+            if (deletionDate != 0 && message.getTimeSent() < deletionDate) {
+                Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": skipping message from " + message.getCounterpart().toString() + " because it was sent prior to our deletion date");
+                return;
+            }
+
             boolean checkForDuplicates = query != null
                     || (isTypeGroupChat && packet.hasChild("delay", "urn:xmpp:delay"))
                     || message.getType() == Message.TYPE_PRIVATE;
@@ -565,9 +571,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                 conversation.endOtrIfNeeded();
             }
 
-            if (message.getEncryption() == Message.ENCRYPTION_NONE || mXmppConnectionService.saveEncryptedMessages()) {
-                mXmppConnectionService.databaseBackend.createMessage(message);
-            }
+            mXmppConnectionService.databaseBackend.createMessage(message);
             final HttpConnectionManager manager = this.mXmppConnectionService.getHttpConnectionManager();
             if (message.trusted() && message.treatAsDownloadable() != Message.Decision.NEVER && manager.getAutoAcceptFileSize() > 0) {
                 manager.createNewDownloadConnection(message);