2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ac1bad7e3ab..e2cea8301ec 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * rfc2047.el (rfc2047-encode-message-header): Don't encode non-address
+        headers as address headers (which breaks if subject has a single ").
+
 2004-05-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * nnimap.el (nnimap-demule): Avoid string-as-multibyte.
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index 7c93160c455..f355ac8bbb4 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -1,5 +1,5 @@
 ;;; rfc2047.el --- functions for encoding and decoding rfc2047 messages
-;; Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1998,1999,2000,02,03,2004  Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;      MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -169,7 +169,7 @@ Should be called narrowed to the head of the message."
              ((eq method 'address-mime)
               (rfc2047-encode-region (point) (point-max)))
              ((eq method 'mime)
-              (let (rfc2047-encoding-type)
+              (let ((rfc2047-encoding-type method))
                 (rfc2047-encode-region (point) (point-max))))
              ((eq method 'default)
               (if (and (featurep 'mule)