2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d56e0e88f91..6232886b88b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-09-17  Richard Stallman  <rms@gnu.org>
 
+        * mail/rmail.el (rmail-retry-failure): Turn off mime processing first.
+
         * epa-mail.el (epa-mail-encrypt): Fix bug when a name has no key.
 
 2012-09-17  Chong Yidong  <cyd@gnu.org>
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index d88862b2d47..5606e71dea4 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4068,6 +4068,13 @@ The variable `rmail-retry-ignored-headers' is a regular expression
 specifying headers which should not be copied into the new message."
   (interactive)
   (require 'mail-utils)
+  (if rmail-enable-mime
+      (with-current-buffer rmail-buffer
+        (if (rmail-mime-message-p)
+            (let ((rmail-mime-mbox-buffer rmail-view-buffer)
+                  (rmail-mime-view-buffer rmail-buffer))
+              (rmail-mime-toggle-raw 'raw)))))
+
   (let ((rmail-this-buffer (current-buffer))
         (msgnum rmail-current-message)
         bounce-start bounce-end bounce-indent resending
@@ -4598,7 +4605,7 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "cd7656f82944d0b92b0d093a5f3a4c36")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "0c18b83f914803d1216e1a9df7ea5275")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\