diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java
index db73aa1b5f..956503282f 100644
--- a/app/src/main/java/eu/faircode/email/ServiceUI.java
+++ b/app/src/main/java/eu/faircode/email/ServiceUI.java
@@ -386,8 +386,12 @@ public class ServiceUI extends IntentService {
                 Log.i("Delayed send id=" + message.id);
                 EntityOperation.queue(this, message, EntityOperation.SEND);
             } else {
-                if (folder.notify)
+                if (folder.notify) {
+                    message.id = null;
+                    message.id = db.message().insertMessage(message);
+                    db.message().deleteMessage(id);
                     EntityOperation.queue(this, message, EntityOperation.SEEN, false, false);
+                }
             }
 
             db.setTransactionSuccessful();