# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1237412817 0
# Node ID 15f6907f88e7c236d18b3beed60b133997845ec4
# Parent  eda48a2d48559233a2afb573b22eec258921171a
(rmail-retry-ignored-headers): Add usual mime headers.
(rmail-retry-failure): Undo previous change.

diff -r eda48a2d4855 -r 15f6907f88e7 lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Wed Mar 18 20:38:41 2009 +0000
+++ b/lisp/mail/rmail.el	Wed Mar 18 21:46:57 2009 +0000
@@ -371,7 +371,7 @@
   :group 'rmail-headers)
 
 ;;;###autoload
-(defcustom rmail-retry-ignored-headers "^x-authentication-warning:"
+(defcustom rmail-retry-ignored-headers "^x-authentication-warning:\\|content-type:\\|content-transfer-encoding:\\|mime-version:"
   "Headers that should be stripped when retrying a failed message."
   :type '(choice regexp (const nil :tag "None"))
   :group 'rmail-headers)
@@ -3762,7 +3762,6 @@
 	    (mail-sendmail-delimit-header)
 	    (save-restriction
 	      (narrow-to-region (point-min) (mail-header-end))
-	      (rmail-delete-headers rmail-ignored-headers)
 	      (rmail-delete-headers rmail-retry-ignored-headers)
 	      (rmail-delete-headers "^\\(sender\\|return-path\\|received\\):")
 	      (setq resending (mail-fetch-field "resent-to"))