diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index c439d2025c..4362775916 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -98,9 +98,10 @@ public class EntityOperation {
         long folder = message.folder;
         try {
             if (SEEN.equals(name)) {
+                boolean ignore = jargs.optBoolean(1, true);
                 for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid)) {
                     db.message().setMessageUiSeen(similar.id, jargs.getBoolean(0));
-                    db.message().setMessageUiIgnored(similar.id, true);
+                    db.message().setMessageUiIgnored(similar.id, ignore);
                 }
 
             } else if (FLAG.equals(name)) {
diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java
index 27f04c472c..67b4b02d83 100644
--- a/app/src/main/java/eu/faircode/email/ServiceUI.java
+++ b/app/src/main/java/eu/faircode/email/ServiceUI.java
@@ -234,10 +234,8 @@ public class ServiceUI extends IntentService {
                     Log.i("Delayed send id=" + message.id);
                     EntityOperation.queue(this, message, EntityOperation.SEND);
                 } else {
-                    if (folder.notify) {
-                        db.message().setMessageUiIgnored(message.id, false);
-                        EntityOperation.queue(this, message, EntityOperation.SEEN, false);
-                    }
+                    if (folder.notify)
+                        EntityOperation.queue(this, message, EntityOperation.SEEN, false, false);
                 }
             }