*** message.el.old	Wed Dec 01 08:30:56 1999
--- message.el	Fri Dec 03 16:24:02 1999
***************
*** 279,284 ****
--- 279,296 ----
    :type 'file
    :group 'message-headers)
  
+ (defcustom message-forward-start-separator
+   "------- Start of forwarded message -------\n"
+   "*Delimiter inserted before forwarded messages."
+   :group 'message-forwarding
+   :type 'string)
+ 
+ (defcustom message-forward-end-separator
+   "------- End of forwarded message -------\n"
+   "*Delimiter inserted after forwarded messages."
+   :group 'message-forwarding
+   :type 'string)
+ 
  (defcustom message-make-forward-subject-function
    'message-forward-subject-author-subject
   "*A list of functions that are called to generate a subject header for forwarded messages.
***************
*** 3847,3859 ****
      (message-goto-body)
      (if message-forward-as-mime
  	 (insert "\n\n<#part type=message/rfc822 disposition=inline>\n")
!       (insert "\n\n"))
      (let ((b (point))
  	  e)
        (mml-insert-buffer cur)
        (setq e (point))
!       (and message-forward-as-mime
! 	   (insert "<#/part>\n"))
        (when (and (not current-prefix-arg)
  		 message-forward-ignored-headers)
  	(save-restriction
--- 3859,3872 ----
      (message-goto-body)
      (if message-forward-as-mime
  	 (insert "\n\n<#part type=message/rfc822 disposition=inline>\n")
!       (insert message-forward-start-separator))
      (let ((b (point))
  	  e)
        (mml-insert-buffer cur)
        (setq e (point))
!       (if message-forward-as-mime
! 	   (insert "<#/part>\n")
! 	(insert message-forward-end-separator))
        (when (and (not current-prefix-arg)
  		 message-forward-ignored-headers)
  	(save-restriction