1 files changed, 4 insertions, 2 deletions

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 24bc1c2635f..c72fdf9a57a 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -654,9 +654,11 @@ Instead, these commands are available:
   (rmail-expunge-and-save)
   ;; Don't switch to the summary buffer even if it was recently visible.
   (if rmail-summary-buffer
-      (bury-buffer rmail-summary-buffer))
+      (progn
+        (replace-buffer-in-windows rmail-summary-buffer)
+        (bury-buffer rmail-summary-buffer)))
   (let ((obuf (current-buffer)))
-    (switch-to-buffer (other-buffer))
+    (replace-buffer-in-windows obuf)
     (bury-buffer obuf)))
 
 ;;;###autoload