2 files changed, 14 insertions, 4 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index dd493d383a3..d0dfd100f44 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * message.el (message-get-reply-headers):
+        Make sure the reply goes to the author if it is a wide reply.
+
 2012-11-16  Jan Tatarik  <jan.tatarik@gmail.com>
 
         * gnus-score.el (gnus-score-body):
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 8905acb9d1f..5a2b4334582 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6730,11 +6730,16 @@ The function is called with one parameter, a cons cell ..."
                                ", "))
             mct (message-fetch-field "mail-copies-to")
             author (or (message-fetch-field "mail-reply-to")
-                       (message-fetch-field "reply-to")
-                       (message-fetch-field "from")
-                       "")
+                       (message-fetch-field "reply-to"))
             mft (and message-use-mail-followup-to
-                     (message-fetch-field "mail-followup-to"))))
+                     (message-fetch-field "mail-followup-to")))
+      ;; Make sure this message goes to the author if this is a wide
+      ;; reply, since Reply-To address may be a list address a mailing
+      ;; list server added.
+      (when (and wide author)
+        (setq cc (concat author ", " cc)))
+      (when (or wide (not author))
+        (setq author (or (message-fetch-field "from") ""))))
 
     ;; Handle special values of Mail-Copies-To.
     (when mct