*** gnus-msg.el~	Wed Mar 28 02:31:28 2007
--- gnus-msg.el	Mon Apr  9 06:35:11 2007
***************
*** 789,794 ****
--- 789,795 ----
  		 (nnheader-narrow-to-headers)
  		 (nnheader-parse-naked-head)))))
  	(message-yank-original)
+ 	(exchange-point-and-mark)
  	(setq beg (or beg (mark t))))
        (when articles
  	(insert "\n")))
*** message.el~	Sun Apr  1 21:54:14 2007
--- message.el	Mon Apr  9 06:35:11 2007
***************
*** 3550,3569 ****
        (delete-windows-on message-reply-buffer t)
        (push-mark (save-excursion
  		   (insert-buffer-substring message-reply-buffer)
  		   (point)))
        (unless arg
! 	(funcall message-cite-function))
!       (if message-cite-reply-above
! 	  (progn
! 	    (message-goto-body)
! 	    (insert body-text)
! 	    (newline)
! 	    (message-goto-body)
! 	    (message-exchange-point-and-mark))
! 	(unless (< (point) (mark-marker))
! 	  (message-exchange-point-and-mark)))
!       (unless (bolp)
! 	(insert ?\n))
        ;; Add a `message-setup-very-last-hook' here?
        ;; Add `gnus-article-highlight-citation' here?
        (unless modified
--- 3550,3572 ----
        (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))))
!       (when message-cite-reply-above
! 	(message-goto-body)
! 	(insert body-text)
! 	(unless (bolp)
! 	  (insert ?\n))
! 	(newline)
! 	(message-goto-body))
        ;; Add a `message-setup-very-last-hook' here?
        ;; Add `gnus-article-highlight-citation' here?
        (unless modified