+(defun notmuch-show-markup-citations-region (beg end)
+ (goto-char beg)
+ (beginning-of-line)
+ (while (< (point) end)
+ (let ((beg-sub (point)))
+ (if (looking-at ">")
+ (progn
+ (while (looking-at ">")
+ (next-line))
+ (let ((overlay (make-overlay beg-sub (point))))
+ (overlay-put overlay 'invisible 'notmuch-show-citation)
+ (overlay-put overlay 'before-string
+ (concat "[" (number-to-string (count-lines beg-sub (point)))
+ " quoted lines.]")))))
+ (if (looking-at "--[ ]?$")
+ (let ((overlay (make-overlay beg-sub end)))
+ (overlay-put overlay 'invisible 'notmuch-show-signature)
+ (overlay-put overlay 'before-string
+ (concat "[" (number-to-string (count-lines beg-sub (point)))
+ "-line signature.]"))
+ (goto-char end)))
+ (next-line))))
+
+(defun notmuch-show-markup-body (unread)
+ (re-search-forward notmuch-show-body-begin-regexp)
+ (next-line 1)
+ (beginning-of-line)
+ (let ((beg (point)))
+ (re-search-forward notmuch-show-body-end-regexp)
+ (if (not unread)
+ (overlay-put (make-overlay beg (match-beginning 0))
+ 'invisible 'notmuch-show-body-read))
+ (notmuch-show-markup-citations-region beg (point))
+ ))
+
+(defun notmuch-show-markup-header ()
+ (re-search-forward notmuch-show-header-begin-regexp)
+ (next-line 2)
+ (beginning-of-line)
+ (let ((beg (point)))
+ (re-search-forward notmuch-show-header-end-regexp)
+ (overlay-put (make-overlay beg (match-beginning 0))
+ 'invisible 'notmuch-show-header)))
+
+(defun notmuch-show-markup-message ()
+ (if (re-search-forward notmuch-show-message-begin-regexp nil t)