diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index ebd0da7a7b..5a5fe0ae0d 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -129,11 +129,9 @@ public class EntityOperation {
     private static void queue(Context context, DB db, EntityMessage message, String name, JSONArray jargs) {
         try {
             if (SEEN.equals(name)) {
-                boolean seen = jargs.getBoolean(0);
                 for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid)) {
                     db.message().setMessageUiSeen(similar.id, jargs.getBoolean(0));
-                    if (seen)
-                        db.message().setMessageUiIgnored(similar.id, true);
+                    db.message().setMessageUiIgnored(similar.id, true);
                 }
 
             } else if (FLAG.equals(name))
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 0bb576057c..ddab077c5f 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -392,16 +392,17 @@ public class ServiceSynchronize extends LifecycleService {
 
                                         case "snooze":
                                             db.message().setMessageSnoozed(message.id, null);
-                                            db.message().setMessageUiIgnored(message.id, false);
 
                                             EntityFolder folder = db.folder().getFolder(message.folder);
                                             if (EntityFolder.OUTBOX.equals(folder.type)) {
                                                 Log.i("Delayed send id=" + message.id);
                                                 EntityOperation.queue(
                                                         ServiceSynchronize.this, db, message, EntityOperation.SEND);
-                                            } else
+                                            } else {
                                                 EntityOperation.queue(
                                                         ServiceSynchronize.this, db, message, EntityOperation.SEEN, false);
+                                                db.message().setMessageUiIgnored(message.id, false);
+                                            }
                                             break;
 
                                         default: