1 files changed, 19 insertions, 12 deletions

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 4d1a3471e67..79649a935b6 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -200,18 +200,25 @@ Called with region narrowed to the message, including headers.")
 ;; Perform BODY in the summary buffer
 ;; in such a way that its cursor is properly updated in its own window.
 (defmacro rmail-select-summary (&rest body)
-  (` (progn (if (rmail-summary-displayed)
-                (let ((window (selected-window)))
-                  (save-excursion
-                    (unwind-protect
-                        (progn
-                          (pop-to-buffer rmail-summary-buffer)
-                          (,@ body))
-                      (select-window window))))
-              (save-excursion
-                (set-buffer rmail-summary-buffer)
-                (progn (,@ body))))
-            (rmail-maybe-display-summary))))
+  (` (let ((total rmail-total-messages))
+       (if (rmail-summary-displayed)
+           (let ((window (selected-window)))
+             (save-excursion
+               (unwind-protect
+                   (progn
+                     (pop-to-buffer rmail-summary-buffer)
+                     ;; rmail-total-messages is a buffer-local var
+                     ;; in the rmail buffer.
+                     ;; This way we make it available for the body
+                     ;; even tho the rmail buffer is not current.
+                     (let ((rmail-total-messages total))
+                       (,@ body)))
+                 (select-window window))))
+         (save-excursion
+           (set-buffer rmail-summary-buffer)
+           (let ((rmail-total-messages total))
+             (,@ body))))
+       (rmail-maybe-display-summary))))
 
 ;;;; *** Rmail Mode ***