diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index b5f82b9674..164f699072 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -521,8 +521,8 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
 
                             EntityMessage message = db.message().getMessage(id);
                             EntityFolder folder = db.folder().getFolder(message.folder);
-                            if (!EntityFolder.OUTBOX.equals(folder.type))
-                                for (EntityMessage tmessage : db.message().getMessageByThread(message.account, message.thread)) {
+                            for (EntityMessage tmessage : db.message().getMessageByThread(message.account, message.thread))
+                                if (message.uid != null) { // Skip drafts and outbox
                                     db.message().setMessageUiSeen(tmessage.id, true);
 
                                     EntityOperation.queue(db, tmessage, EntityOperation.SEEN, true);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java
index d2a46879a7..6c599c4fd0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@@ -414,11 +414,12 @@ public class FragmentMessage extends FragmentEx {
                     db.beginTransaction();
 
                     EntityMessage message = db.message().getMessage(id);
-                    for (EntityMessage tmessage : db.message().getMessageByThread(message.account, message.thread)) {
-                        db.message().setMessageUiSeen(tmessage.id, !message.ui_seen);
+                    for (EntityMessage tmessage : db.message().getMessageByThread(message.account, message.thread))
+                        if (message.uid != null) { // Skip drafts and outbox
+                            db.message().setMessageUiSeen(tmessage.id, !message.ui_seen);
 
-                        EntityOperation.queue(db, tmessage, EntityOperation.SEEN, !tmessage.ui_seen);
-                    }
+                            EntityOperation.queue(db, tmessage, EntityOperation.SEEN, !tmessage.ui_seen);
+                        }
 
                     db.setTransactionSuccessful();
                 } finally {