*** message.el~	Tue Mar 27 21:43:24 2007
--- message.el	Mon Apr  9 06:35:11 2007
***************
*** 3346,3358 ****
        (delete-windows-on message-reply-buffer t)
        (push-mark (save-excursion
  		   (insert-buffer-substring message-reply-buffer)
  		   (point)))
        (unless arg
! 	(funcall message-cite-function))
!       (unless (< (point) (mark-marker))
!         (message-exchange-point-and-mark))
!       (unless (bolp)
! 	(insert ?\n))
        (unless modified
  	(setq message-checksum (message-checksum))))))
  
--- 3346,3361 ----
        (delete-windows-on message-reply-buffer t)
        (push-mark (save-excursion
  		   (insert-buffer-substring message-reply-buffer)
+ 		   (unless (bolp)
+ 		     (insert ?\n))
  		   (point)))
        (unless arg
! 	(funcall message-cite-function)
! 	(unless (eq (char-before (mark t)) ?\n)
! 	  (let ((pt (point)))
! 	    (goto-char (mark t))
! 	    (insert-before-markers ?\n)
! 	    (goto-char pt))))
        (unless modified
  	(setq message-checksum (message-checksum))))))