2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6aabc603518..43af9904859 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-29  Mark Lillibridge  <mark.lillibridge@hp.com>
+
+        * mail/rmailmm.el (rmail-insert-mime-forwarded-message): Insert
+        the undecoded text of the message being forwarded.  (Bug#9521)
+
 2012-12-28  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-sh.el (tramp-set-file-uid-gid): Convert UID and GID to
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 11bccd59765..a9bbe6c2da3 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -1368,8 +1368,8 @@ This is the usual value of `rmail-insert-mime-forwarded-message-function'."
   (let ((message-buffer
          (with-current-buffer forward-buffer
            (if rmail-buffer-swapped
-               forward-buffer
-             rmail-view-buffer))))
+               rmail-view-buffer
+             forward-buffer))))
     (save-restriction
       (narrow-to-region (point) (point))
       (message-forward-make-body-mime message-buffer))))