diff --git a/modules/mailserver/default.nix b/modules/mailserver/default.nix
index 83264fa..291663d 100644
--- a/modules/mailserver/default.nix
+++ b/modules/mailserver/default.nix
@@ -22,7 +22,7 @@ with lib;
         loginAccounts = {
           "julien@malka.sh" = {
             hashedPasswordFile = "/run/secrets/malkash-pw";
-            aliases = [ "postmaster@malka.sh" ];
+            catchAll = [ "malka.sh" ];
           };
           "julien.malka@ens.school" = {
             hashedPasswordFile = "/run/secrets/ensmailmalka-pw";
@@ -31,13 +31,16 @@ with lib;
             hashedPasswordFile = "/run/secrets/ensmailmondon-pw";
           };
 
-          "docs@malka.sh" = {
-            hashedPassword = "$2y$05$NdEncXtSDspL0reJDrm1NubqOrSi2IO.4qVJvsUVFDsAdItVuc2Fa";
-          };
         };
         certificateScheme = 3;
       };
 
+      services.roundcube = {
+        enable = true;
+        plugins = [ "managesieve" ];
+        hostName = "webmail.julienmalka.me";
+      };
+
       sops.secrets.malkash-pw = { };
       sops.secrets.ensmailmalka-pw = { };
       sops.secrets.ensmailmondon-pw = { };