* message.el (message-setup-1): Setup alternative email before

	generate-headers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c84bfa8..66506a2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-07  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-setup-1): Setup alternative email before
+       generate-headers.
+
 2003-05-07  Dave Love  <fx@gnu.org>
 
        * rfc2047.el (rfc2047-encode-region): Skip \n as whitespace.

diff --git a/lisp/message.el b/lisp/message.el
index 255e7ea..b03b8ab 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5252,6 +5252,10 @@ are not included."
     (when message-default-mail-headers
       (insert message-default-mail-headers)
       (or (bolp) (insert ?\n)))
+    (save-restriction
+      (message-narrow-to-headers)
+      (if message-alternative-emails
+         (message-use-alternative-email-as-from)))
     (when message-generate-headers-first
       (message-generate-headers
        (message-headers-to-generate
@@ -5263,8 +5267,6 @@ are not included."
   (message-insert-signature)
   (save-restriction
     (message-narrow-to-headers)
-    (if message-alternative-emails
-       (message-use-alternative-email-as-from))
     (run-hooks 'message-header-setup-hook))
   (set-buffer-modified-p nil)
   (setq buffer-undo-list nil)