message.el (message-setup-1): Handle message-generate-headers-first set to t.

2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ceef5e5df2b..7571016a8cb 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-06  Julien Danjou  <julien@danjou.info>
+
+        * message.el (message-setup-1): Handle message-generate-headers-first
+        set to t.
+
 2011-02-04  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * message.el (message-setup-1): Remove the read-only stuff, since it
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 37d64bc5f1b..3ba57caba4f 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6417,7 +6417,9 @@ are not included."
   ;; `References:' header if `message-generate-headers-first' was nil.
   ;; Therefore, always generate it first.
   (let ((message-generate-headers-first
-         (append message-generate-headers-first '(References))))
+         (if (eq message-generate-headers-first t)
+             t
+           (append message-generate-headers-first '(References)))))
     (when (message-news-p)
       (when message-default-news-headers
         (insert message-default-news-headers)