diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index df67d9762f..e59881eeb0 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -157,8 +157,9 @@ public class EntityOperation {
                 cal_keep.set(Calendar.MILLISECOND, 0);
 
                 // Create copy without uid in target folder
-                // Message with same msgid can be in archive and source folder
+                // Message with same msgid can be in archive
                 if (message.uid != null &&
+                        message.ui_seen &&
                         target.synchronize &&
                         message.received > cal_keep.getTimeInMillis() &&
                         db.message().countMessageByMsgId(target.id, message.msgid) == 0) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index d5400e8539..8ab65eea47 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1933,6 +1933,7 @@ public class FragmentCompose extends FragmentEx {
                         EntityOperation.queue(context, db, draft, EntityOperation.DELETE);
                     else {
                         EntityOperation.queue(context, db, draft, EntityOperation.SEEN, true);
+                        draft.ui_seen = true;
                         EntityOperation.queue(context, db, draft, EntityOperation.MOVE, trash.id);
                     }