-(defun notmuch-show-markup-this-header ()
- (if (re-search-forward notmuch-show-header-begin-regexp nil t)
+(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)