diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index b23bc8200f..37881e102d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -5301,7 +5301,9 @@ public class FragmentCompose extends FragmentBase {
 
                     if (dirty) {
                         draft.received = new Date().getTime();
+                        draft.sent = draft.received;
                         db.message().setMessageReceived(draft.id, draft.received);
+                        db.message().setMessageSent(draft.id, draft.sent);
                     }
 
                     // Execute action