diff --git a/home/mail/default.nix b/home/mail/default.nix
index 4869ad7..6a3930c 100644
--- a/home/mail/default.nix
+++ b/home/mail/default.nix
@@ -238,7 +238,21 @@ in {
           address = "mail@vbrandl.net";
           host = "mail.vbrandl.net";
           displayName = "Valentin Brandl";
-          extraMailboxes = [ "Archive" ];
+          extraMailboxes = [
+            "Archive"
+            "Banking"
+            "Conversation"
+            "Covid"
+            "Dev"
+            "Memberships"
+            "Orders"
+            "Rent"
+            "Social"
+            "Support"
+            "Travel"
+            "Uni"
+            "Work"
+          ];
 
           /* #set use_from = yes */
           /* #set envelope_from = true */
@@ -263,7 +277,20 @@ in {
           address = "vbrandl@riseup.net";
           host = "mail.riseup.net";
           displayName = "Valentin Brandl";
-          extraMailboxes = [ "SKS-devel" ];
+          extraMailboxes = [
+            "Archive"
+            "Banking"
+            "Contracts"
+            "Conversation"
+            "Dev"
+            "Mailinglists"
+            "Newsletter"
+            "Orders"
+            "Social"
+            "Support"
+            "Travel"
+            "Uni"
+          ];
         }) // {
       userName = "vbrandl";
       gpg = {