diff --git a/mu4e/mu4e-draft.el b/mu4e/mu4e-draft.el
index d65ab00f..57e0e6c5 100644
--- a/mu4e/mu4e-draft.el
+++ b/mu4e/mu4e-draft.el
@@ -362,7 +362,9 @@ appropriate sent-messages folder. If MSGPATH is nil, do nothing."
       (message-generate-headers '(Message-ID)))
     ;; older Emacsen (<= 28 perhaps?) won't update the Date
     ;; if there already is one; so make sure it's gone.
-    (message-remove-header "Date")
+    (save-restriction
+      (message-narrow-to-headers)
+      (message-remove-header "Date"))
     (message-generate-headers '(Date Subject From))
     (mu4e--delimit-headers 'undelimit))) ;; remove separator