diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index dff6f0e1b7..8d85a17bb1 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -512,6 +512,10 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
                 message.msgid = EntityMessage.generateMessageId(from.substring(at + 1));
         }
 
+        // Set sent time
+        message.sent = new Date().getTime();
+        db.message().setMessageSent(message.id, message.sent);
+
         // Create message
         Properties props = MessageHelper.getSessionProperties();
         // https://javaee.github.io/javamail/docs/api/javax/mail/internet/package-summary.html