diff --git a/goimapnotify/.config/goimapnotify/disroot.conf b/goimapnotify/.config/goimapnotify/disroot.conf
index 3089c22..72aba26 100644
--- a/goimapnotify/.config/goimapnotify/disroot.conf
+++ b/goimapnotify/.config/goimapnotify/disroot.conf
@@ -8,8 +8,17 @@
   "username": "akasroua@disroot.org",
   "passwordCmd": "pass mail/disroot",
   "onNewMail": "mbsync disroot",
-  "onNewMailPost": "notmuch new",
+  "onNewMailPost": "mu index --lazy-check",
   "boxes": [
-    "INBOX"
+    "INBOX",
+    "Sent",
+    "Trash",
+    "Archive",
+    "Junk",
+    "Bookings",
+    "Buying",
+    "Services",
+    "SMART",
+    "Travel"
   ]
 }
diff --git a/goimapnotify/.config/goimapnotify/gmail.conf b/goimapnotify/.config/goimapnotify/gmail.conf
index bd3f988..3b0bce8 100644
--- a/goimapnotify/.config/goimapnotify/gmail.conf
+++ b/goimapnotify/.config/goimapnotify/gmail.conf
@@ -8,8 +8,12 @@
   "username": "akasroua@gmail.com",
   "passwordCmd": "pass mail/gmail",
   "onNewMail": "mbsync gmail",
-  "onNewMailPost": "notmuch new",
+  "onNewMailPost": "mu index --lazy-check",
   "boxes": [
-    "INBOX"
+    "INBOX",
+    "[Gmail]/Sent Mail",
+    "[Gmail]/Bin",
+    "[Gmail]/Spam",
+    "[Gmail]/All Mail"
   ]
 }
diff --git a/goimapnotify/.config/goimapnotify/ugent.conf b/goimapnotify/.config/goimapnotify/ugent.conf
index 35c12dd..d0cc10d 100644
--- a/goimapnotify/.config/goimapnotify/ugent.conf
+++ b/goimapnotify/.config/goimapnotify/ugent.conf
@@ -9,8 +9,12 @@
   "passwordCmd": "/home/coolneng/.local/share/scripts/mutt_oauth2.py /home/coolneng/.cache/tokenfile",
   "xoauth2": true,
   "onNewMail": "mbsync ugent",
-  "onNewMailPost": "notmuch new",
+  "onNewMailPost": "mu index --lazy-check",
   "boxes": [
-    "INBOX"
+    "INBOX",
+    "Sent Items",
+    "Deleted Items",
+    "Archive",
+    "Junk Email"
   ]
 }
diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index 17993aa..530ffe6 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -14,7 +14,7 @@ MaildirStore gmail-local
 Subfolders Verbatim
 # The trailing "/" is important
 Path ~/.mail/gmail/
-Inbox ~/.mail/gmail/Inbox/
+Inbox ~/.mail/gmail/inbox/
 
 Channel sync-gmail-default
 Far :gmail-remote:
@@ -47,12 +47,19 @@ Create Both
 Expunge Both
 SyncState *
 
+Channel sync-gmail-archive
+Far :gmail-remote:"[Gmail]/All Mail"
+Near :gmail-local:archive
+Create Both
+Expunge Both
+SyncState *
 
 Group gmail
 Channel sync-gmail-default
 Channel sync-gmail-sent
 Channel sync-gmail-trash
 Channel sync-gmail-junk
+Channel sync-gmail-archive
 
 IMAPAccount ugent
 Host outlook.office365.com
@@ -164,6 +171,13 @@ Create Both
 Expunge Both
 SyncState *
 
+Channel sync-disroot-archive
+Far :disroot-remote:"Archive"
+Near :disroot-local:archive
+Create Both
+Expunge Both
+SyncState *
+
 Channel sync-disroot-bookings
 Far :disroot-remote:"Bookings"
 Near :disroot-local:bookings
@@ -204,9 +218,11 @@ Group disroot
 Channel sync-disroot-default
 Channel sync-disroot-sent
 Channel sync-disroot-trash
+Channel sync-disroot-archive
 Channel sync-disroot-junk
 Channel sync-disroot-bookings
 Channel sync-disroot-buying
 Channel sync-disroot-services
 Channel sync-disroot-smart
 Channel sync-disroot-travel
+Channel sync-disroot-archive