diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index dee61dc8f5..ab0205400b 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -358,7 +358,7 @@ public class ServiceSend extends ServiceBase {
             int ops = db.operation().getOperationCount(outbox.id, id, EntityOperation.SEND);
             if (ops == 0) {
                 EntityMessage message = db.message().getMessage(id);
-                if (message != null)
+                if (message != null && message.ui_snoozed == null)
                     EntityOperation.queue(this, message, EntityOperation.SEND);
             }
         }
diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java
index 1b74831d08..aaac665c5e 100644
--- a/app/src/main/java/eu/faircode/email/ServiceUI.java
+++ b/app/src/main/java/eu/faircode/email/ServiceUI.java
@@ -458,8 +458,10 @@ public class ServiceUI extends IntentService {
 
             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);
+                if (message.ui_snoozed != null) {
+                    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