X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=89089c53e7c40f032330a28bbc871aa7911376fa;hp=0863c6b7af7a2f7a9d53495a3b0efc619c5fa43a;hb=aa34eb2a3761c770b485486d0f94564f5e925128;hpb=0ceef70efdfaa082506e5298c0a031e626d83ea9

diff --git a/notmuch.el b/notmuch.el
index 0863c6b7..89089c53 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -66,7 +66,7 @@
 (defvar notmuch-show-part-end-regexp         "part}")
 (defvar notmuch-show-marker-regexp "\\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$")
 
-(defvar notmuch-show-id-regexp "ID: \\([^ ]*\\)")
+(defvar notmuch-show-id-regexp "ID: \\(.*\\)$")
 (defvar notmuch-show-tags-regexp "(\\([^)]*\\))$")
 
 (defun notmuch-show-get-message-id ()
@@ -178,17 +178,17 @@ Before moving, also remove the \"unread\" tag from the current message."
 	    (goto-char end)))
       (next-line))))
 
-(defun notmuch-show-markup-body (unread)
+(defun notmuch-show-markup-body ()
   (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))
-    ))
+    (let ((end (match-beginning 0)))
+      (if (not (member "unread" (notmuch-show-get-tags)))
+	  (overlay-put (make-overlay beg end)
+		       'invisible 'notmuch-show-body-read))
+      (notmuch-show-markup-citations-region beg end))))
 
 (defun notmuch-show-markup-header ()
   (re-search-forward notmuch-show-header-begin-regexp)
@@ -202,9 +202,8 @@ Before moving, also remove the \"unread\" tag from the current message."
 (defun notmuch-show-markup-message ()
   (if (re-search-forward notmuch-show-message-begin-regexp nil t)
       (progn
-	(let ((unread (looking-at ".*unread$")))
-	  (notmuch-show-markup-header)
-	  (notmuch-show-markup-body unread)))
+	(notmuch-show-markup-header)
+	(notmuch-show-markup-body))
     (goto-char (point-max))))
 
 (defun notmuch-show-hide-markers ()