* message.el (message-setup-1): Prefer to save message-reply-buffer as a buffer.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e334ef97244..1c1c62bb1b0 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -5,6 +5,7 @@
         (message-with-reply-buffer, message-widen-reply)
         (message-yank-original): Handle non-buffer values of
         message-reply-buffer (Bug#4080).
+        (message-setup-1): Prefer to save message-reply-buffer as a buffer.
 
 2010-01-17  Juanma Barranquero  <lekktu@gmail.com>
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index c91bcd77195..7194813422a 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6320,7 +6320,11 @@ are not included."
     (condition-case nil
         (add-to-list 'message-send-actions
                      `(apply ',(car action) ',(cdr action)))))
-  (setq message-reply-buffer yank-action)
+  (setq message-reply-buffer
+        (if (and (consp yank-action)
+                 (eq (car yank-action) 'insert-buffer))
+            (nth 1 yank-action)
+          yank-action))
   (goto-char (point-min))
   ;; Insert all the headers.
   (mail-header-format