diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index f883429618..347d911915 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2378,10 +2378,6 @@ class Core {
                             msgid = helper.getMessageID();
                             if (TextUtils.isEmpty(msgid))
                                 msgid = uidl;
-                        } else {
-                            _new = false;
-                            Log.i(folder.name + " POP having uidl=" + uidl);
-                            continue;
                         }
                     } else {
                         uidl = null;
@@ -2394,12 +2390,6 @@ class Core {
                             if (time != null)
                                 msgid = Long.toString(time);
                         }
-
-                        if (db.message().countMessageByMsgId(folder.id, msgid) > 0) {
-                            _new = false;
-                            Log.i(folder.name + " POP having msgid=" + msgid);
-                            continue;
-                        }
                     }
 
                     if (TextUtils.isEmpty(msgid)) {
@@ -2407,6 +2397,12 @@ class Core {
                         continue;
                     }
 
+                    if (db.message().countMessageByMsgId(folder.id, msgid) > 0) {
+                        _new = false;
+                        Log.i(folder.name + " POP having msgid=" + msgid + " uidl=" + uidl);
+                        continue;
+                    }
+
                     try {
                         Long sent = helper.getSent();
                         Long received = helper.getReceivedHeader();