X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=6d7228fbbf026be083c67640cbda3dbe7b7c3a1e;hp=f3adfcf5cb1ed2a7c67e5dd6a9b02e8c493e1272;hb=fcc36df1fa37b940a46a3c14f0ccee8a39875145;hpb=6945e7e103fdc10cb676571b313eac5abd62d0c6

diff --git a/notmuch.el b/notmuch.el
index f3adfcf5..6d7228fb 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -695,8 +695,11 @@ which this thread was originally shown."
       (set-marker beg nil)
       (set-marker end nil)
       )))
+
 (defun notmuch-fontify-headers ()
   (progn
+    (while (looking-at "[[:space:]]")
+      (forward-char))
     (if (looking-at "[Tt]o:")
 	(progn
 	  (overlay-put (make-overlay (point) (re-search-forward ":"))
@@ -727,39 +730,36 @@ which this thread was originally shown."
   (forward-line)
   (let ((beg (point-marker))
 	(summary-end (copy-marker (line-beginning-position 2)))
+	(subject-end (copy-marker (line-end-position 2)))
+	(invis-spec (make-symbol "notmuch-show-header"))
         (btn nil))
-    (overlay-put (make-overlay beg summary-end) 'face 'notmuch-message-summary-face)
-    (setq btn (make-button beg summary-end :type 'notmuch-button-body-toggle-type))
-    (forward-line 1)
-    (end-of-line)
-    (let ((beg-hidden (point-marker)))
-      (re-search-forward notmuch-show-header-end-regexp)
-      (beginning-of-line)
-      (let ((end (point-marker)))
-        (goto-char beg)
-        (forward-line)
-        (while (looking-at "[A-Za-z][-A-Za-z0-9]*:")
-          (beginning-of-line)
-	  (notmuch-fontify-headers)
-          (forward-line)
-          )
-	(indent-rigidly beg end depth)
-        (let ((invis-spec (make-symbol "notmuch-show-header")))
-          (add-to-invisibility-spec (cons invis-spec t))
-          (overlay-put (make-overlay beg-hidden end)
-                       'invisible invis-spec)
-          (goto-char beg)
-          (forward-line)
-          (make-button (line-beginning-position) (line-end-position)
-                        'invisibility-spec (cons invis-spec t)
-                        :type 'notmuch-button-headers-toggle-type))
-        (goto-char end)
-        (insert "\n")
-	(set-marker beg nil)
-	(set-marker beg-hidden nil)
-	(set-marker end nil)
-	))
-    btn))
+    (re-search-forward notmuch-show-header-end-regexp)
+    (beginning-of-line)
+    (let ((end (point-marker)))
+      (indent-rigidly beg end depth)
+      (goto-char beg)
+      (overlay-put (make-overlay (line-beginning-position) summary-end) 'face 'notmuch-message-summary-face)
+      (setq btn (make-button (line-beginning-position) summary-end :type 'notmuch-button-body-toggle-type))
+      (forward-line)
+      (add-to-invisibility-spec invis-spec)
+      (overlay-put (make-overlay subject-end end)
+		   'invisible invis-spec)
+      (make-button (line-beginning-position) subject-end
+		   'invisibility-spec invis-spec
+		   :type 'notmuch-button-headers-toggle-type)
+      (while (looking-at "[[:space:]]*[A-Za-z][-A-Za-z0-9]*:")
+	(beginning-of-line)
+	(notmuch-fontify-headers)
+	(forward-line)
+	)
+      (goto-char end)
+      (insert "\n")
+      (set-marker beg nil)
+      (set-marker summary-end nil)
+      (set-marker subject-end nil)
+      (set-marker end nil)
+      )
+  btn))
 
 (defun notmuch-show-markup-message ()
   (if (re-search-forward notmuch-show-message-begin-regexp nil t)