diff --git a/modules/programs/msmtp.nix b/modules/programs/msmtp.nix
index e1fc35d2..04e7be8e 100644
--- a/modules/programs/msmtp.nix
+++ b/modules/programs/msmtp.nix
@@ -28,9 +28,12 @@ let
           tls_trust_file = smtp.tls.certificatesFile;
         } // optionalAttrs (passwordCommand != null) {
           passwordeval = toString passwordCommand;
-        } // msmtp.extraConfig) ++ optional primary ''
+        } // msmtp.extraConfig) ++ optional primary "account default : ${name}"
+      ++ map (alias: ''
 
-          account default : ${name}'');
+        account ${alias} : ${name}
+        from ${alias}
+      '') aliases);
 
   configFile = mailAccounts: ''
     # Generated by Home Manager.