diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java
index 346995cb36..27f04c472c 100644
--- a/app/src/main/java/eu/faircode/email/ServiceUI.java
+++ b/app/src/main/java/eu/faircode/email/ServiceUI.java
@@ -232,12 +232,12 @@ public class ServiceUI extends IntentService {
                 EntityFolder folder = db.folder().getFolder(message.folder);
                 if (EntityFolder.OUTBOX.equals(folder.type)) {
                     Log.i("Delayed send id=" + message.id);
-                    EntityOperation.queue(
-                            this, message, EntityOperation.SEND);
-                } else if (folder.notify) {
-                    EntityOperation.queue(
-                            this, message, EntityOperation.SEEN, false);
-                    db.message().setMessageUiIgnored(message.id, false);
+                    EntityOperation.queue(this, message, EntityOperation.SEND);
+                } else {
+                    if (folder.notify) {
+                        db.message().setMessageUiIgnored(message.id, false);
+                        EntityOperation.queue(this, message, EntityOperation.SEEN, false);
+                    }
                 }
             }