diff --git a/mail/.config/aerc/accounts.conf b/mail/.config/aerc/accounts.conf
index 09905e3..264c7ef 100644
--- a/mail/.config/aerc/accounts.conf
+++ b/mail/.config/aerc/accounts.conf
@@ -1,8 +1,9 @@
 [Personal]
-source            = maildir://~/documents/mail
+source            = notmuch://~/documents/mail
 outgoing          = smtp+plain://marty.oehme%40gmail.com@smtp.gmail.com:587
 outgoing-cred-cmd = pass 'misc/aerc-gmail-app-password' | head -1
 default           = Inbox
 smtp-starttls     = yes
 from              = Marty Oehme <marty.oehme@gmail.com>
 copy-to           = Sent
+query-map         = ~/.config/aerc/notmuch-querymap
diff --git a/mail/.config/aerc/binds.conf b/mail/.config/aerc/binds.conf
index c47f729..e333b89 100644
--- a/mail/.config/aerc/binds.conf
+++ b/mail/.config/aerc/binds.conf
@@ -1,9 +1,10 @@
 # Binds are of the form <key sequence> = <command to run>
 # To use '=' in a key sequence, substitute it with "Eq": "<Ctrl+Eq>"
 # If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit
-<C-p> = :prev-tab<Enter>
-<C-n> = :next-tab<Enter>
+gT = :prev-tab<Enter>
+gt = :next-tab<Enter>
 <C-t> = :term<Enter>
+gR = :exec updatemail
 
 [messages]
 q = :quit<Enter>
@@ -26,9 +27,12 @@ J = :next-folder<Enter>
 <C-n> = :next-folder<Enter>
 K = :prev-folder<Enter>
 <C-p> = :prev-folder<Enter>
-gi = :cf INBOX<Enter>
-ga = :cf [Google Mail]/All Mail<Enter>
-gt = :cf [Google Mail]/Trash<Enter>
+gi = :cf Inbox<Enter>
+gm = :cf Important<Enter>
+ga = :cf Archive<Enter>
+gA = :cf All<Enter>
+gs = :cf Sent<Enter>
+gt = :cf Trash<Enter>
 
 v = :mark -t<Enter>
 V = :mark -v<Enter>
@@ -36,9 +40,9 @@ V = :mark -v<Enter>
 <Enter> = :view<Enter>
 l = :view<Enter>
 D = :prompt 'Really delete this message?' 'delete-message'<Enter>
-d = :mv [Google Mail]/Trash<Enter>
-a = :mv [Google Mail]/All Mail<Enter>
-A = :mv [Google Mail]/All Mail<Enter>
+d = :modify-labels +deleted -inbox -archived<Enter>
+a = :modify-labels +archived -deleted -inbox<Enter>
+A = :modify-labels +archived -deleted -inbox<Enter>
 
 C = :compose<Enter>
 
diff --git a/mail/.config/aerc/notmuch-querymap b/mail/.config/aerc/notmuch-querymap
new file mode 100644
index 0000000..79db81e
--- /dev/null
+++ b/mail/.config/aerc/notmuch-querymap
@@ -0,0 +1,9 @@
+All=*
+Inbox=tag:inbox and not tag:archived and not tag:dump
+Archive=tag:archived and not tag:inbox and not tag:dump
+Dump=tag:dump and not tag:inbox
+Trash=tag:deleted
+Important=tag:flagged
+Sent=from:marty.oehme@gmail.com
+Replied=tag:replied
+Patches=subject:/^\[PATCH/
diff --git a/mail/.config/isync/mbsyncrc b/mail/.config/isync/mbsyncrc
index d6e6447..6320c0d 100644
--- a/mail/.config/isync/mbsyncrc
+++ b/mail/.config/isync/mbsyncrc
@@ -14,6 +14,7 @@ SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 #CertificateFile ~/.cert/imap.gmail.com.pem
 #CertificateFile ~/.cert/Equifax_Secure_CA.pem
+PipelineDepth 50
 
 IMAPStore gmail-remote
 Account gmail