diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index 1ea85208..a7352390 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -303,10 +303,11 @@ Message-ID."
   (add-hook 'before-save-hook
     (lambda()
       ;; replace the date
-      (message-remove-header "Date")
-      (message-generate-headers '(Date Message-ID))
-      (save-match-data
-        (mu4e~draft-remove-mail-header-separator))) nil t)
+      (save-excursion
+        (message-remove-header "Date")
+        (message-generate-headers '(Date Message-ID))
+        (save-match-data
+          (mu4e~draft-remove-mail-header-separator)))) nil t)
   (add-hook 'after-save-hook
     (lambda ()
       (save-match-data