diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index c7d76df487..c19f1bcd81 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -354,6 +354,9 @@ public interface DaoMessage {
     @Query("UPDATE message SET notifying = :notifying WHERE id = :id")
     int setMessageNotifying(long id, int notifying);
 
+    @Query("UPDATE message SET received = :received WHERE id = :id")
+    int setMessageReceived(long id, long received);
+
     @Query("UPDATE message SET seen = :seen WHERE id = :id")
     int setMessageSeen(long id, boolean seen);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index e34d342e60..f34b0f4009 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2665,7 +2665,6 @@ public class FragmentCompose extends FragmentBase {
                         draft.bcc = abcc;
                         draft.subject = subject;
                         draft.encrypt = encrypt;
-                        draft.received = new Date().getTime();
                         draft.sender = MessageHelper.getSortKey(draft.from);
                         Uri lookupUri = ContactInfo.getLookupUri(context, draft.from);
                         draft.avatar = (lookupUri == null ? null : lookupUri.toString());
@@ -2725,6 +2724,11 @@ public class FragmentCompose extends FragmentBase {
                         }
                     }
 
+                    if (dirty) {
+                        draft.received = new Date().getTime();
+                        db.message().setMessageReceived(draft.id, draft.received);
+                    }
+
                     // Remove unused inline images
                     StringBuilder sb = new StringBuilder();
                     sb.append(body);