diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index 85a1ce2..5053bbf 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -15,10 +15,10 @@ Path ~/.mail/jeremy-dormitzer-gmail-com/
 Inbox ~/.mail/jeremy-dormitzer-gmail-com/Inbox
 SubFolders Verbatim
 
-Channel jeremy-dormitzer-gmail-com
+Channel jeremy-dormitzer-gmail-com-all
 Master :jeremy-dormitzer-gmail-com-remote:
 Slave :jeremy-dormitzer-gmail-com-local:
-Patterns * ![Gmail]*
+Patterns * ![Gmail]* !"[Google Mail]*" !Archive !Trash !Sent !Drafts
 Create Both
 SyncState *
 
@@ -34,7 +34,13 @@ Slave :jeremy-dormitzer-gmail-com-local:"Sent"
 Create Both
 SyncState *
 
-Channel jeremy-dormitzer-gmail-com-all
+Channel jeremy-dormitzer-gmail-com-drafts
+Master :jeremy-dormitzer-gmail-com-remote:"[Gmail]/Drafts"
+Slave :jeremy-dormitzer-gmail-com-local:"Drafts"
+Create Both
+SyncState *
+
+Channel jeremy-dormitzer-gmail-com-archive
 Master :jeremy-dormitzer-gmail-com-remote:"[Gmail]/All Mail"
 Slave :jeremy-dormitzer-gmail-com-local:"Archive"
 Create Both
@@ -42,9 +48,10 @@ SyncState *
 
 Group jeremy-dormitzer-gmail-com
 Channel jeremy-dormitzer-gmail-com-trash
-Channel jeremy-dormitzer-gmail-com
-Channel jeremy-dormitzer-gmail-com-sent
 Channel jeremy-dormitzer-gmail-com-all
+Channel jeremy-dormitzer-gmail-com-drafts
+Channel jeremy-dormitzer-gmail-com-sent
+Channel jeremy-dormitzer-gmail-com-archive
 
 IMAPAccount jeremydormitzer-lola-com
 Host imap.gmail.com
@@ -63,10 +70,10 @@ Path ~/.mail/jeremydormitzer-lola-com/
 Inbox ~/.mail/jeremydormitzer-lola-com/Inbox
 SubFolders Verbatim
 
-Channel jeremydormitzer-lola-com
+Channel jeremydormitzer-lola-com-all
 Master :jeremydormitzer-lola-com-remote:
 Slave :jeremydormitzer-lola-com-local:
-Patterns * ![Gmail]*
+Patterns * ![Gmail]* !"[Google Mail]*" !Archive !Trash !Sent !Drafts
 Create Both
 SyncState *
 
@@ -82,7 +89,13 @@ Slave :jeremydormitzer-lola-com-local:"Sent"
 Create Both
 SyncState *
 
-Channel jeremydormitzer-lola-com-all
+Channel jeremydormitzer-lola-com-drafts
+Master :jeremydormitzer-lola-com-remote:"[Gmail]/Drafts"
+Slave :jeremydormitzer-lola-com-local:"Drafts"
+Create Both
+SyncState *
+
+Channel jeremydormitzer-lola-com-archive
 Master :jeremydormitzer-lola-com-remote:"[Gmail]/All Mail"
 Slave :jeremydormitzer-lola-com-local:"Archive"
 Create Both
@@ -90,6 +103,7 @@ SyncState *
 
 Group jeremydormitzer-lola-com
 Channel jeremydormitzer-lola-com-trash
-Channel jeremydormitzer-lola-com
-Channel jeremydormitzer-lola-com-sent
 Channel jeremydormitzer-lola-com-all
+Channel jeremydormitzer-lola-com-drafts
+Channel jeremydormitzer-lola-com-sent
+Channel jeremydormitzer-lola-com-archive