(rmail-reply): Don't try to add a References header when replying to

mail without References or Message-Id.  (Bug#4525)

2 files changed, 11 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca6b63f7c87..a6f543e957e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-23  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmail.el (rmail-reply): Don't try to add a References header when
+        replying to mail without References or Message-Id.  (Bug#4525)
+
 2009-09-23  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
         * term/ns-win.el (ns-reg-to-script): New variable.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 078a4518adf..41f8fc05cb1 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3537,10 +3537,12 @@ use \\[mail-yank-original] to yank the original message into it."
                    (aref rmail-msgref-vector msgnum))
                  rmail-answered-attr-index))
      nil
-     (list (cons "References" (if references
-                                  (concat (mapconcat 'identity references " ")
-                                          " " message-id)
-                                message-id))))))
+     (if (or references message-id)
+         (list (cons "References" (if references
+                                      (concat
+                                       (mapconcat 'identity references " ")
+                                       " " message-id)
+                                    message-id)))))))
 
 (defun rmail-mark-message (buffer msgnum-list attribute)
   "Give BUFFER's message number in MSGNUM-LIST the attribute ATTRIBUTE.