1 files changed, 6 insertions, 1 deletions

diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index a230e75754f..bd915141de1 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -27,6 +27,8 @@
 
 ;;; Code:
 
+(require 'rmail)
+
 (defun undigestify-rmail-message ()
   "Break up a digest message into its constituent messages.
 Leaves original message, deleted, before the undigestified messages."
@@ -105,7 +107,10 @@ Leaves original message, deleted, before the undigestified messages."
           (let ((n rmail-current-message))
             (rmail-forget-messages)
             (rmail-show-message n)
-            (rmail-delete-forward)))
+            (rmail-delete-forward)
+            (if (rmail-summary-exists)
+                (rmail-select-summary
+                 (rmail-update-summary)))))
       (cond (error
              (narrow-to-region (point-min) (1+ (point-max)))
              (delete-region (point-min) (point-max))