*** mml.el.~6.65.~	Mon Dec 30 17:25:32 2002
--- mml.el	Mon Dec 30 21:50:17 2002
***************
*** 1007,1012 ****
--- 1007,1022 ----
    (mml-insert-tag 'part 'type type 'disposition "inline")
    (forward-line -1))
  
+ (defun mml-preview-insert-mft ()
+   "Insert a Mail-Followup-To header before previewing an article.
+ Should be adopted if code in `message-send-mail' is changed."
+   (when (and (message-mail-p)
+ 	     (message-subscribed-p)
+ 	     (not (mail-fetch-field "mail-followup-to"))
+ 	     (message-make-mft))
+     (message-position-on-field "Mail-Followup-To" "X-Draft-From")
+     (insert (message-make-mft))))
+ 
  (defun mml-preview (&optional raw)
    "Display current buffer with Gnus, in a new buffer.
  If RAW, don't highlight the article."
***************
*** 1027,1032 ****
--- 1037,1043 ----
  				   "*MIME preview of ") (buffer-name))))
        (erase-buffer)
        (insert-buffer buf)
+       (mml-preview-insert-mft)
        (let ((message-deletable-headers (if (message-news-p)
  					   nil
  					 message-deletable-headers)))

--- message.el.~6.268.~	Mon Dec 30 21:28:50 2002
+++ message.el	Mon Dec 30 21:51:56 2002
@@ -1896,6 +1896,13 @@
 		   (message-fetch-field "cc")
 		   (message-fetch-field "bcc")))))))
 
+(defun message-subscribed-p ()
+  "Say whether we need to insert a MFT header."
+  (or message-subscribed-regexps
+      message-subscribed-addresses
+      message-subscribed-address-file
+      message-subscribed-address-functions))
+
 (defun message-next-header ()
   "Go to the beginning of the next header."
   (beginning-of-line)
@@ -3343,10 +3350,7 @@
     (save-restriction
       (message-narrow-to-headers)
       ;; Generate the Mail-Followup-To header if the header is not there...
-      (if (and (or message-subscribed-regexps
-		   message-subscribed-addresses
-		   message-subscribed-address-file
-		   message-subscribed-address-functions)
+      (if (and (message-subscribed-p)
 	       (not (mail-fetch-field "mail-followup-to")))
 	  (setq headers
 		(cons