diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index f10591cccd..9b93b00529 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2089,6 +2089,10 @@ class Core {
                             " msgid=" + msgid + " thread=" + thread);
 
                     if (dup.uid == null || dup.uid <= uid) {
+                        message = dup;
+                        update = true;
+                        process = (dup.uid == null);
+
                         Log.i(folder.name + " set uid=" + uid);
                         dup.uid = uid;
                         dup.thread = thread;
@@ -2099,10 +2103,6 @@ class Core {
                         }
 
                         dup.error = null;
-
-                        message = dup;
-                        update = true;
-                        process = (dup.uid == null);
                     } else
                         return null;
                 }