diff --git a/mutt/.notmuch-config b/mutt/.notmuch-config
index 6855bb1..413b289 100644
--- a/mutt/.notmuch-config
+++ b/mutt/.notmuch-config
@@ -48,7 +48,7 @@ other_email=ryan@andthensome.nl;
 #		in the mail store.
 #
 [new]
-tags=unread;inbox;
+tags=new
 ignore=
 
 # Search configuration
diff --git a/mutt/.scripts/notmuch-hook.sh b/mutt/.scripts/notmuch-hook.sh
index bf3d40f..64e3ccb 100755
--- a/mutt/.scripts/notmuch-hook.sh
+++ b/mutt/.scripts/notmuch-hook.sh
@@ -2,6 +2,8 @@
 notmuch new
 notmuch tag +inbox +new -- tag:new
 notmuch tag -new -inbox +sent -- from:alrayyes@gmail.com or from:ryan@andthensome.nl
+notmuch tag +gmail -- to:alrayyes@gmail.com
+notmuch tag +andthensome -- to:ryan@andthensome.nl
 
 ACCOUNTS=( "gmail" "andthensome")
 for ACCOUNT in "${ACCOUNTS[@]}"