diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 9cd1ed1090..2de3c82534 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -941,7 +941,7 @@ class Core {
                     newuid = found;
                 else if (!newuid.equals(found)) {
                     Log.e(folder.name + " Added=" + newuid + " found=" + found);
-                    newuid = found;
+                    newuid = Math.max(newuid, found);
                 }
 
             if (newuid != null && (message.uid == null || newuid > message.uid))