diff --git a/.config/mbsync/config b/.config/mbsync/config
index 2e26318..d9a9e81 100644
--- a/.config/mbsync/config
+++ b/.config/mbsync/config
@@ -13,11 +13,45 @@ Subfolders Verbatim
 Path ~/.mail/ferano.io/
 Inbox ~/.mail/ferano.io/Inbox
 
-Channel ferano.io
-Far :ferano.io.remote:
-Near :ferano.io.local:
-# Include everything
-Patterns *
+Channel ferano.io-inbox
+Far :ferano.io.remote:INBOX
+Near :ferano.io.local:INBOX
+Sync All
+Create Both
+Remove Both
+Expunge Both
+SyncState *
+
+Channel ferano.io-drafts
+Far :ferano.io.remote:Drafts
+Near :ferano.io.local:Drafts
+Sync All
+Create Both
+Remove Both
+Expunge Both
+SyncState *
+
+Channel ferano.io-sent
+Far :ferano.io.remote:Sent
+Near :ferano.io.local:Sent
+Sync All
+Create Both
+Remove Both
+Expunge Both
+SyncState *
+
+Channel ferano.io-junk
+Far :ferano.io.remote:Junk
+Near :ferano.io.local:Junk
+Sync All
+Create Both
+Remove Both
+Expunge Both
+SyncState *
+
+Channel ferano.io-trash
+Far :ferano.io.remote:Trash
+Near :ferano.io.local:Trash
 Sync All
 Create Both
 Remove Both
@@ -38,11 +72,36 @@ Subfolders Verbatim
 Path ~/.mail/gmail/
 Inbox ~/.mail/gmail/INBOX
 
-Channel gmail
-Far :gmail.remote:
-Near :gmail.local:
-# Only sync the folders you've checked in IMAP
-Patterns "INBOX" "[Gmail]/Sent Mail" "[Gmail]/Drafts" "[Gmail]/Trash"
+Channel gmail-inbox
+Far :gmail.remote:INBOX
+Near :gmail.local:INBOX
+Sync All
+Create Both
+Remove Both
+Expunge Both
+SyncState *
+
+Channel gmail-drafts
+Far :gmail.remote:"[Gmail]/Drafts"
+Near :gmail.local:"[Gmail]/Drafts"
+Sync All
+Create Both
+Remove Both
+Expunge Both
+SyncState *
+
+Channel gmail-sent
+Far :gmail.remote:"[Gmail]/Sent Mail"
+Near :gmail.local:"[Gmail]/Sent Mail"
+Sync All
+Create Both
+Remove Both
+Expunge Both
+SyncState *
+
+Channel gmail-trash
+Far :gmail.remote:"[Gmail]/Trash"
+Near :gmail.local:"[Gmail]/Trash"
 Sync All
 Create Both
 Remove Both
@@ -50,6 +109,26 @@ Expunge Both
 SyncState *
 
 
+Group ferano.io
+Channel ferano.io-inbox
+Channel ferano.io-drafts
+Channel ferano.io-sent
+Channel ferano.io-junk
+Channel ferano.io-trash
+
+Group gmail
+Channel gmail-inbox
+Channel gmail-drafts
+Channel gmail-sent
+Channel gmail-trash
+
 Group all
-Channel ferano.io
-Channel gmail
+Channel ferano.io-inbox
+Channel ferano.io-drafts
+Channel ferano.io-sent
+Channel ferano.io-junk
+Channel ferano.io-trash
+Channel gmail-inbox
+Channel gmail-drafts
+Channel gmail-sent
+Channel gmail-trash