diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java
index 956503282f..7ac0c1ce8a 100644
--- a/app/src/main/java/eu/faircode/email/ServiceUI.java
+++ b/app/src/main/java/eu/faircode/email/ServiceUI.java
@@ -379,17 +379,18 @@ public class ServiceUI extends IntentService {
             if (message == null)
                 return;
 
-            db.message().setMessageSnoozed(message.id, null);
-
             EntityFolder folder = db.folder().getFolder(message.folder);
             if (EntityFolder.OUTBOX.equals(folder.type)) {
                 Log.i("Delayed send id=" + message.id);
+                db.message().setMessageSnoozed(message.id, null);
                 EntityOperation.queue(this, message, EntityOperation.SEND);
             } else {
                 if (folder.notify) {
+                    // A new message ID is needed for a new (wearable) notification
+                    db.message().deleteMessage(id);
                     message.id = null;
                     message.id = db.message().insertMessage(message);
-                    db.message().deleteMessage(id);
+                    db.message().setMessageSnoozed(message.id, null);
                     EntityOperation.queue(this, message, EntityOperation.SEEN, false, false);
                 }
             }