From 4eed85187f15ffdebf6f19f4b8e156dac68a5b36 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Mon, 30 Nov 2020 22:09:47 +0200
Subject: [PATCH] mu4e-compose: Don't auto-update Message-Id/Date

Fixes #1846
---
 mu4e/mu4e-compose.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index 1504a37e..1a3b0286 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -363,8 +363,8 @@ Message-ID."
 (defun mu4e~compose-before-save-hook-fn ()
   ;; replace the date
   (save-excursion
-    (message-remove-header "Date")
-    (message-generate-headers '(Date Message-ID))
+    (unless (message-fetch-field "Message-ID")
+      (message-generate-headers '(Date Message-ID)))
     (save-match-data
       (mu4e~draft-remove-mail-header-separator))))