diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 24cc777352..8b89e1f762 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -361,6 +361,11 @@ public class ServiceSend extends ServiceBase {
 
             MessageHelper helper = new MessageHelper(imessage);
 
+            if (message.uid != null) {
+                Log.e("Outbox id=" + message.id + " uid=" + message.uid);
+                message.uid = null;
+            }
+
             message.id = null;
             message.folder = sent.id;
             message.identity = null;