diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix
index dd91e597..1faee820 100644
--- a/modules/programs/himalaya.nix
+++ b/modules/programs/himalaya.nix
@@ -14,10 +14,12 @@ let
         name = account.realName;
         default = account.primary;
 
-        inbox-folder = account.folders.inbox;
-        sent-folder = account.folders.sent;
-        draft-folder = account.folders.drafts;
-        # NOTE: himalaya does not support configuring the name of the trash folder
+        mailboxes = {
+          inbox = account.folders.inbox;
+          sent = account.folders.sent;
+          draft = account.folders.drafts;
+          # NOTE: himalaya does not support configuring the name of the trash folder
+        };
 
         # FIXME: does not support disabling TLS altogether
         # NOTE: does not accept sequence of strings for password commands
diff --git a/tests/modules/programs/himalaya/himalaya-expected.toml b/tests/modules/programs/himalaya/himalaya-expected.toml
index 6d27107e..6c2dfb84 100644
--- a/tests/modules/programs/himalaya/himalaya-expected.toml
+++ b/tests/modules/programs/himalaya/himalaya-expected.toml
@@ -4,18 +4,20 @@ name = ""
 ["hm@example.com"]
 default = true
 default-page-size = 50
-draft-folder = "Drafts"
 email = "hm@example.com"
 imap-host = "imap.example.com"
 imap-login = "home.manager"
 imap-passwd-cmd = "'password-command'"
 imap-port = 995
 imap-starttls = false
-inbox-folder = "In"
 name = "H. M. Test"
-sent-folder = "Out"
 smtp-host = "smtp.example.com"
 smtp-login = "home.manager"
 smtp-passwd-cmd = "'password-command'"
 smtp-port = 465
 smtp-starttls = false
+
+["hm@example.com".mailboxes]
+draft = "Drafts"
+inbox = "In"
+sent = "Out"