diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix
index ed085e18..474bbaaf 100644
--- a/nixbld-etc-nixos/configuration.nix
+++ b/nixbld-etc-nixos/configuration.nix
@@ -860,8 +860,16 @@ in
     localDnsResolver = false;  # conflicts with dnsmasq
     fqdn = "mail.m-labs.hk";
     domains = [ "m-labs.hk" ];
-    loginAccounts = (import /etc/nixos/secret/email_accounts.nix);
     certificateScheme = 3;
+  } // (import /etc/nixos/secret/email_settings.nix);
+  services.roundcube = {
+    enable = true;
+    hostName = "mail.m-labs.hk";
+    extraConfig = ''
+      $config['smtp_server'] = "tls://${config.mailserver.fqdn}";
+      $config['smtp_user'] = "%u";
+      $config['smtp_pass'] = "%p";
+    '';
   };
 
   services.nextcloud = {