diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 876dc04532..e449b8e05c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -4949,6 +4949,9 @@ public class FragmentCompose extends FragmentBase {
                 } else {
                     args.putBoolean("saved", true);
 
+                    if (!data.draft.ui_seen)
+                        EntityOperation.queue(context, data.draft, EntityOperation.SEEN, true);
+
                     // External draft
                     if (data.draft.identity == null) {
                         for (EntityIdentity identity : data.identities)