2 files changed, 7 insertions, 5 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 870164023d5..c0cf9472dd8 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-18  Sam Steingold  <sds@gnu.org>
+
+        * message.el (message-bury): Minor cleanup.
+
 2013-03-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * nndir.el (nndir-request-list): Remove 2nd argument passed to
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index a6638097b47..2b2a0a94413 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4097,11 +4097,9 @@ Instead, just auto-save the buffer and then bury it."
 
 (defun message-bury (buffer)
   "Bury this mail BUFFER."
-  (if message-return-action
-      (progn
-        (bury-buffer buffer)
-        (apply (car message-return-action) (cdr message-return-action)))
-    (with-current-buffer buffer (bury-buffer))))
+  (bury-buffer buffer)
+  (when message-return-action
+    (apply (car message-return-action) (cdr message-return-action))))
 
 (defun message-send (&optional arg)
   "Send the message in the current buffer.