diff --git a/configs/workhorse/mail-fetcher.nix b/configs/workhorse/mail-fetcher.nix
index 00a4ae9..28d1f01 100644
--- a/configs/workhorse/mail-fetcher.nix
+++ b/configs/workhorse/mail-fetcher.nix
@@ -630,7 +630,7 @@ in {
             -----END CERTIFICATE-----'';
         };
         mbsync = {
-          enable = true;
+          enable = false;
           create = "both";
         };
         notmuch.enable = true;
diff --git a/system/desktop/mail-stuff.nix b/system/desktop/mail-stuff.nix
index 967fda6..138f996 100644
--- a/system/desktop/mail-stuff.nix
+++ b/system/desktop/mail-stuff.nix
@@ -226,7 +226,7 @@ in {
 
     set index_format="${index_format} %r |"
 
-    virtual-mailboxes "INBOX" "notmuch://?query=(tag:inbox or (tag:sent and not tag:archive)) AND NOT tag:discourse AND NOT tag:muted AND NOT tag:list AND NOT tag:billing"
+    virtual-mailboxes "INBOX" "notmuch://?query=(tag:inbox or (tag:sent and not tag:archive)) AND NOT tag:discourse AND NOT tag:muted AND NOT tag:list AND NOT tag:spam AND NOT tag:fraud"
     virtual-mailboxes "Unread" "notmuch://?query=(tag:unread AND NOT tag:muted)"
     virtual-mailboxes "Space left" "notmuch://?query=((tag:spaceleft OR tag:space-lef) AND NOT tag:muted)"
     virtual-mailboxes "Sononym" "notmuch://?query=(tag:sononym AND NOT tag:muted)"
@@ -241,10 +241,11 @@ in {
     virtual-mailboxes "Discourse.games" "notmuch://?query=(tag:discourse AND tag:games AND NOT tag:muted)"
     virtual-mailboxes "Discourse.meta" "notmuch://?query=(tag:discourse AND tag:meta AND NOT tag:muted)"
     virtual-mailboxes "Discourse.events" "notmuch://?query=(tag:discourse AND tag:events AND NOT tag:muted)"
-    virtual-mailboxes "Starred" "notmuch://?query=tag:flagged"
+    virtual-mailboxes "Flagged" "notmuch://?query=tag:flagged"
     virtual-mailboxes "Archive" "notmuch://?query=tag:archive"
     virtual-mailboxes "Sent" "notmuch://?query=tag:sent"
-    virtual-mailboxes "Junk" "notmuch://?query=tag:junk"
+    virtual-mailboxes "Fraud" "notmuch://?query=(tag:fraud)"
+    virtual-mailboxes "Junk" "notmuch://?query=(tag:junk OR tag:spam OR tag:fraud)"
     virtual-mailboxes "All" "notmuch://?query=*"
 
     tag-transforms "junk"     "k" \