Merge from emacs-23; up to 2010-06-12T10:58:54Z!romain@orebokech.com.

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc27b8d15c8..2067128fbe8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-27  Kenichi Handa  <handa@m17n.org>
+
+        * mail/sendmail.el (mail-encode-header): Avoid double encoding by
+        let-binding rfc2047-encode-encoded-words to nil.
+
 2011-05-27  Glenn Morris  <rgm@gnu.org>
 
         * mail/emacsbug.el: Don't require url-util.
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index c6cd4c75ebd..60f3062ea7b 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1022,7 +1022,8 @@ Return non-nil if and only if some part of the header is encoded."
             (if (and selected (coding-system-get selected :mime-charset))
                 (cons selected mm-coding-system-priorities)
               mm-coding-system-priorities))
-           (tick (buffer-chars-modified-tick)))
+           (tick (buffer-chars-modified-tick))
+           (rfc2047-encode-encoded-words nil))
       (rfc2047-encode-message-header)
       (= tick (buffer-chars-modified-tick)))))