Don't reuse previous Message-id when resending.

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8660bd5b764..1a64321c5f5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-23  Richard Stallman  <rms@gnu.org>
+
+        * mail/rmail.el (rmail-retry-ignored-headers): Add message-id.
+
 2011-06-23  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-sh.el (tramp-method-out-of-band-p): Check, whether
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index ccae59eff26..a65c8376642 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -349,7 +349,7 @@ If nil, display all header fields except those matched by
   :group 'rmail-headers)
 
 ;;;###autoload
-(defcustom rmail-retry-ignored-headers (purecopy "^x-authentication-warning:\\|^x-detected-operating-system:\\|^x-spam[-a-z]*:\\|content-type:\\|content-transfer-encoding:\\|mime-version:")
+(defcustom rmail-retry-ignored-headers (purecopy "^x-authentication-warning:\\|^x-detected-operating-system:\\|^x-spam[-a-z]*:\\|content-type:\\|content-transfer-encoding:\\|mime-version:\\|message-id:")
   "Headers that should be stripped when retrying a failed message."
   :type '(choice regexp (const nil :tag "None"))
   :group 'rmail-headers