diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix
index f7864c1ee..dd91e5976 100644
--- a/modules/programs/himalaya.nix
+++ b/modules/programs/himalaya.nix
@@ -14,6 +14,11 @@ 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
+
         # FIXME: does not support disabling TLS altogether
         # NOTE: does not accept sequence of strings for password commands
         imap-login = account.userName;
diff --git a/tests/modules/programs/himalaya/himalaya-expected.toml b/tests/modules/programs/himalaya/himalaya-expected.toml
index db94d42a8..6d27107ec 100644
--- a/tests/modules/programs/himalaya/himalaya-expected.toml
+++ b/tests/modules/programs/himalaya/himalaya-expected.toml
@@ -4,13 +4,16 @@ 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'"
diff --git a/tests/modules/programs/himalaya/himalaya.nix b/tests/modules/programs/himalaya/himalaya.nix
index 827a09bef..13872d158 100644
--- a/tests/modules/programs/himalaya/himalaya.nix
+++ b/tests/modules/programs/himalaya/himalaya.nix
@@ -13,6 +13,12 @@ with lib;
         settings = { default-page-size = 50; };
       };
 
+      folders = {
+        inbox = "In";
+        sent = "Out";
+        drafts = "Drafts";
+      };
+
       imap.port = 995;
       smtp.port = 465;
     };