1 files changed, 6 insertions, 1 deletions

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 932f52204c5..d5a85741371 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -714,7 +714,12 @@ Prefix arg means don't delete this window."
     (if (and (or (window-dedicated-p (frame-selected-window))
                  (cdr (assq 'mail-dedicated-frame (frame-parameters))))
              (not (null (delq (selected-frame) (visible-frame-list)))))
-        (delete-frame (selected-frame))
+        (progn
+          (if (display-multi-frame-p)
+              (delete-frame (selected-frame))
+            ;; The previous frame is where normally they have the
+            ;; RMAIL buffer displayed.
+            (other-frame -1)))
       (let (rmail-flag summary-buffer)
         (and (not arg)
              (not (one-window-p))