diff --git a/modules/programs/meli.nix b/modules/programs/meli.nix
index d8c61ed3..6240ef4b 100644
--- a/modules/programs/meli.nix
+++ b/modules/programs/meli.nix
@@ -34,6 +34,13 @@ let
       send_mail = mkSmtp account;
       mailboxes = account.meli.mailboxAliases;
     }
+    // lib.optionalAttrs (account.flavor == "fastmail.com") {
+      server_username = account.userName;
+      server_password_command = lib.concatMapStringsSep " " lib.escapeShellArg account.passwordCommand;
+      format = "jmap";
+      server_url = "https://api.fastmail.com/jmap/session";
+      use_token = true;
+    }
     // account.meli.settings
   );