diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index 3d7c6d20..09b0f6e6 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -201,6 +201,9 @@ appear on disk."
     (lambda ()
       (mu4e~compose-set-friendly-buffer-name)
       (mu4e~draft-insert-mail-header-separator)
+      ;; hide some headers again
+      (let ((message-hidden-headers mu4e~compose-hidden-headers))
+	(message-hide-headers))
       (set-buffer-modified-p nil)
       ;; update the file on disk -- ie., without the separator
       (mu4e~proc-add (buffer-file-name) mu4e~draft-drafts-folder)) nil t))