diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index 2ae566ec..d7b1478e 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -366,7 +366,8 @@ Message-ID."
     (save-restriction
       (message-narrow-to-headers)
       (unless (message-fetch-field "Message-ID")
-        (message-generate-headers '(Date Message-ID))))
+        (message-generate-headers '(Message-ID)))
+      (message-generate-headers '(Date)))
     (save-match-data
       (mu4e~draft-remove-mail-header-separator))))