Decode message headers of non-MIME messages in Rmail.

 lisp/mail/rmail.el (rmail-show-message-1): Decode any RFC2047 encoded
 headers of non-MIME messages, when rmail-enable-mime is non-nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37286d0780c19b7e0b8d4de8261b7e6e762f05db..401f1f4f540a70515191f60c2be2768998f4cf5a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-31  Eli Zaretskii  <eliz@gnu.org>
+
+       * mail/rmail.el (rmail-show-message-1): Decode any RFC2047 encoded
+       headers of non-MIME messages, when rmail-enable-mime is non-nil.
+
 2011-12-29  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp-sh.el (tramp-find-shell): Set "remote-shell" property

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 1ea01bdadb8062a8b2d4d4d7d3a8e36088187da1..2c94cfdf212139bdd6744a4876b48cb6616430f3 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2773,7 +2773,15 @@ The current mail message becomes the message displayed."
              (forward-line))
            (goto-char (point-min)))
          ;; Copy the headers to the front of the message view buffer.
-         (rmail-copy-headers beg end))
+         (rmail-copy-headers beg end)
+         ;; Decode any RFC2047 encoded message headers.
+         (if rmail-enable-mime
+             (with-current-buffer rmail-view-buffer
+               (rfc2047-decode-region
+                (point-min)
+                (progn
+                  (search-forward "\n\n" nil 'move)
+                  (point))))))
        ;; highlight the message, activate any URL like text and add
        ;; special highlighting for and quoted material.
        (with-current-buffer rmail-view-buffer