1 files changed, 16 insertions, 14 deletions
diff --git a/custom/jao-custom-notmuch.el b/custom/jao-custom-notmuch.el
index 18c62b7..7ac409f 100644
--- a/custom/jao-custom-notmuch.el
+++ b/custom/jao-custom-notmuch.el
@@ -172,18 +172,19 @@
 
 (jao-notmuch-def-searches today
   `(,(jao-notmuch--q "new" "N" nil (list jao-notmuch--new "not tag:draft"))
-    ,(jao-notmuch--q "drafts" "D" nil '("tag:draft"))
-    ,(jao-notmuch--q "sent" "S" nil '("date:1d.." "tag:sent"))
+    ,(jao-notmuch--q "drafts" "D" nil '("tag:draft") t)
+    ,(jao-notmuch--q "sent" "S" nil '("date:1d.." "tag:sent") t)
     ,(jao-notmuch--q "today" "T" nil
                      '("tag:jao" "date:24h.."
-                       "not tag:\"/(sent|feeds|spam|local)/\""))))
+                       "not tag:\"/(sent|feeds|spam|local)/\"")
+                     t)))
 
 (jao-notmuch-def-searches trove
   '((:query "tag:trove" :name "trove" :search-type tree)
     (:query "tag:hacking" :name "hacking" :search-type tree)
     (:query "not tag:trove and not tag:hacking" :name "untroved"
             :search-type tree)
-    (:query "tag:sent" :name "sent" :search-type tree)))
+    (:query "tag:sent" :name "sent")))
 
 (jao-notmuch-def-searches nil
   '((:query "*" :name "messages" :search-type tree)))
@@ -233,19 +234,20 @@
       notmuch-tag-formats
       (let (;; (d `(:foreground ,(face-attribute 'jao-themes-dimm :foreground)))
             (e `(:foreground ,(face-attribute 'jao-themes-error :foreground))))
-        `(("unread")
-          ("signed")
-          ("new" "·")
-          ("replied" "↩" (propertize tag 'face '(:family "Fira Code")))
-          ("sent" "↑")
-          ("attachment" "⧺")
+        `(("attachment" "⧺")
+          ("bigml" "b")
           ("deleted" "⛒" (propertize tag 'face '(:underline nil ,@e)))
+          ("feeds" "f")
           ("flagged" "✓")
+          ("forwarded" "→")
+          ("gmane" "g")
           ("jao" "j")
-          ("bigml" "b")
-          ("feeds" "f")
           ("lists" "l")
-          ("gmane" "g")))
+          ("new" "·")
+          ("replied" "↩" (propertize tag 'face '(:family "Fira Code")))
+          ("sent" "↑")
+          ("signed")
+          ("unread")))
       notmuch-tag-deleted-formats
       '(("unread")
         ("new")
@@ -471,7 +473,7 @@
     (if ext
         (funcall browse-url-secondary-browser-function url)
       (window-configuration-to-register ?G)
-      (select-window notmuch-tree-message-window)
+      (select-window notmuch-tree-message-window)t
       (eww url))))
 
 (defun jao-notmuch-from-eww (keep-eww-buffer)