2 files changed, 21 insertions, 18 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 82cde814cb2..2a2b5b9bc2d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,11 +1,15 @@
+2008-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * message.el (message-make-in-reply-to): Use mm-with-multibyte-buffer.
+
 2008-03-28  Michael Harnois  <mdharnois@gmail.com>  (tiny change)
 
         * nnimap.el (nnimap-find-minmax-uid): Fix Exchange 2007 IMAP problem.
 
 2008-03-24  Reiner Steib  <Reiner.Steib@gmx.de>
 
-        * message.el (message-signature-separator): Change default.  Improve
-        custom type.
+        * message.el (message-signature-separator): Change default.
+        Improve custom type.
         (message-cite-function): Change default to
         message-cite-original-without-signature.
 
@@ -18,9 +22,9 @@
         (message-shorten-references): Be more strict when building list of
         valid references to comply with GNKSA.
 
-        * gnus-group.el (gnus-read-ephemeral-bug-group)
-        (gnus-read-ephemeral-debian-bug-group)
-        (gnus-read-ephemeral-emacs-bug-group): Use the correct variable.
+        * gnus-group.el (gnus-read-ephemeral-bug-group)
+        (gnus-read-ephemeral-debian-bug-group)
+        (gnus-read-ephemeral-emacs-bug-group): Use the correct variable.
 
         * message.el (message-info): Don't use booleanp which isn't supported
         in Emacs 21 and XEmacs.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index a35d7b1bf98..1ce7e461839 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5345,19 +5345,18 @@ In posting styles use `(\"Expires\" (make-expires-date 30))'."
                    ;; Quote a string containing non-ASCII characters.
                    ;; It will make the RFC2047 encoder cause an error
                    ;; if there are special characters.
-                   (let ((default-enable-multibyte-characters t))
-                     (with-temp-buffer
-                       (insert (car name))
-                       (goto-char (point-min))
-                       (while (search-forward "\"" nil t)
-                         (when (prog2
-                                   (backward-char)
-                                   (zerop (% (skip-chars-backward "\\\\") 2))
-                                 (goto-char (match-beginning 0)))
-                           (insert "\\"))
-                         (forward-char))
-                       ;; Those quotes will be removed by the RFC2047 encoder.
-                       (concat "\"" (buffer-string) "\"")))
+                   (mm-with-multibyte-buffer
+                     (insert (car name))
+                     (goto-char (point-min))
+                     (while (search-forward "\"" nil t)
+                       (when (prog2
+                                 (backward-char)
+                                 (zerop (% (skip-chars-backward "\\\\") 2))
+                               (goto-char (match-beginning 0)))
+                         (insert "\\"))
+                       (forward-char))
+                     ;; Those quotes will be removed by the RFC2047 encoder.
+                     (concat "\"" (buffer-string) "\""))
                  (car name))
              (nth 1 name))
            "'s message of \""