In rmail, decode "encoded-words" of header components on replying.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0c9f55..a70330d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-22  Kenichi Handa  <handa@m17n.org>
+
+       * mail/rmail.el (rmail-start-mail): Decode "encoded-words" of
+       header components.
+
 2011-02-19  Kenichi Handa  <handa@m17n.org>
 
        * mail/rmailmm.el (rmail-mime-find-header-encoding): Be sure to

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index fc4b642..5e9baed 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3449,6 +3449,16 @@ does not pop any summary buffer."
        (setq yank-action (list 'insert-buffer replybuffer)))
     (setq others (cons (cons "cc" cc) others))
     (setq others (cons (cons "in-reply-to" in-reply-to) others))
+    (setq others
+         (mapcar #'(lambda (elt)
+                     (cons (car elt) (if (stringp (cdr elt))
+                                         (rfc2047-decode-string (cdr elt)))))
+                 others))
+    (if (stringp to) (setq to (rfc2047-decode-string to)))
+    (if (stringp in-reply-to)
+       (setq in-reply-to (rfc2047-decode-string in-reply-to)))
+    (if (stringp cc) (setq cc (rfc2047-decode-string cc)))
+    (if (stringp subject) (setq subject (rfc2047-decode-string subject)))
     (if same-window
        (compose-mail to subject others
                      noerase nil