--- message.el	Fri Oct 12 16:39:31 2001
+++ /home/egoge/bin/emacs-lisp/message.el	Tue Oct 16 01:51:57 2001
@@ -3943,7 +3943,6 @@
   (when message-default-headers
     (insert message-default-headers)
     (or (bolp) (insert ?\n)))
-  (put-text-property (point-min) (point) 'field 'header)
   (put-text-property
    (point)
    (progn
@@ -3979,6 +3978,9 @@
   (set-buffer-modified-p nil)
   (setq buffer-undo-list nil)
   (run-hooks 'message-setup-hook)
+  (save-restriction
+    (message-narrow-to-headers)
+    (put-text-property (point-min) (point-max) 'field 'header))
   (message-position-point)
   (undo-boundary))