(rmail-make-basic-summary-line): Limit line count

to reformatted header if we have reformatted it.

1 files changed, 9 insertions, 2 deletions

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 799f14d0bb8..7cfe5d53c15 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -381,8 +381,15 @@ nil for FUNCTION means all messages."
           (save-excursion
             (save-restriction
               (widen)
-              (let
-                  ((lines (count-lines (rmail-msgbeg msgnum) (rmail-msgend msgnum))))
+              (let ((beg (rmail-msgbeg msgnum))
+                    (end (rmail-msgend msgnum))
+                    lines)
+                (save-excursion
+                  (goto-char beg)
+                  ;; Count only lines in the reformatted header,
+                  ;; if we have reformatted it.
+                  (search-forward "\n*** EOOH ***\n" end t)
+                  (setq lines (count-lines (point) end)))
                 (format (cond
                          ((<= lines     9) "   [%d]")
                          ((<= lines    99) "  [%d]")