diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index d935f8f0043..dac06441f6d 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1279,8 +1279,8 @@ Create the buffer if necessary."
   (let* ((suffix (file-name-nondirectory (or buffer-file-name (buffer-name))))
 	 (name (format " *message-viewer %s*" suffix))
 	 (buf (get-buffer name)))
-    (unless buf
-      (generate-new-buffer name))))
+    (or buf
+	(generate-new-buffer name))))
 
 (defun rmail-change-major-mode-hook ()
   ;; Bring the actual Rmail messages back into the main buffer.