diff --git a/.config/aerc/mail-sync.sh b/.config/aerc/mail-sync.sh
deleted file mode 100755
index c8b1ab45..00000000
--- a/.config/aerc/mail-sync.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-MBSYNC=$(pgrep mbsync)
-NOTMUCH=$(pgrep notmuch)
-
-if [ -n "$MBSYNC" -o -n "$NOTMUCH" ]; then
-    echo "Already running one instance of mbsync or notmuch. Exiting..."
-    exit 0
-fi
-
-echo "Deleting messages tagged as *deleted*"
-notmuch search --format=text0 --output=files tag:deleted | xargs -0 --no-run-if-empty rm -v
-
-mbsync -Va
-notmuch new
diff --git a/.config/yadm/tracked b/.config/yadm/tracked
index 38b20364..8f3a4695 100644
--- a/.config/yadm/tracked
+++ b/.config/yadm/tracked
@@ -50,3 +50,5 @@
 .notmuch-config
 .notmuch
 .config/imapnotify
+.config/mail
+.config/afew
diff --git a/.notmuch-config b/.notmuch-config
index f0f89fc6..d3ccbc36 100644
--- a/.notmuch-config
+++ b/.notmuch-config
@@ -5,10 +5,11 @@ path=/home/fic/.mail
 [user]
 name=Daniel Fichtinger
 primary_email=daniel@ficd.ca
-other_email=18daf3@queensu.ca; fichtinger.d@queensu.ca
+other_email=18daf3@queensu.ca;fichtinger.d@queensu.ca;ficcdaf@proton.me;
 
 [new]
-tags=new;inbox;unread;
+tags=new
+# tags=new;inbox;unread;
 # tags=unread;inbox;sent;
 # ignore=
 
diff --git a/.notmuch/hooks/post-new b/.notmuch/hooks/post-new
index 01240373..acf1fda9 100755
--- a/.notmuch/hooks/post-new
+++ b/.notmuch/hooks/post-new
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-notmuch tag +school -new -- "path:school/**"
-notmuch tag -inbox -new +sent from:daniel@ficd.ca or from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca or from:ficcdaf@proton.me
-# notmuch tag +inbox -new -- "path:*/INBOX/*"
-notmuch tag +personal -new -- "path:personal/**"
+# notmuch tag +school -new -- "path:school/**"
+# notmuch tag -inbox -new +sent from:daniel@ficd.ca or from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca or from:ficcdaf@proton.me
+# # notmuch tag +inbox -new -- "path:*/INBOX/*"
+# notmuch tag +personal -new -- "path:personal/**"
+
+afew --tag --new