diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 636c31137d..5036644446 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1938,10 +1938,12 @@ class Core {
                         }
                     }
 
-                    if (TextUtils.isEmpty(msgid)) {
-                        Log.w(folder.name + " POP no msgid");
-                        continue;
-                    }
+                    if (TextUtils.isEmpty(msgid))
+                        if (uidl == null) {
+                            Log.w(folder.name + " POP no msgid");
+                            continue;
+                        } else
+                            msgid = uidl;
 
                     try {
                         Log.i(folder.name + " POP sync=" + uidl + "/" + msgid);