diff --git a/modules/nixos/mail-server/autodiscover.nix b/modules/nixos/mail-server/autodiscover.nix
index 2d73d0a..a744eb3 100644
--- a/modules/nixos/mail-server/autodiscover.nix
+++ b/modules/nixos/mail-server/autodiscover.nix
@@ -5,6 +5,8 @@
   ...
 }:
 let
+  radicaleHostFor = domain: "cal.${domain}";
+
   mkThunderbirdAutoconfig = domain:
     pkgs.writeText "autoconfig-${domain}.xml" ''
       <?xml version="1.0" encoding="UTF-8"?>
@@ -29,6 +31,18 @@ let
             <username>%EMAILADDRESS%</username>
             <authentication>password-cleartext</authentication>
           </outgoingServer>
+
+          <addressBook type="carddav">
+            <username>%EMAILADDRESS%</username>
+            <authentication>http-basic</authentication>
+            <serverURL>https://${radicaleHostFor domain}/</serverURL>
+          </addressBook>
+
+          <calendar type="caldav">
+            <username>%EMAILADDRESS%</username>
+            <authentication>http-basic</authentication>
+            <serverURL>https://${radicaleHostFor domain}/</serverURL>
+          </calendar>
         </emailProvider>
       </clientConfig>
     '';
diff --git a/modules/nixos/mail-server/radicale.nix b/modules/nixos/mail-server/radicale.nix
index 26a2b01..dbb09d2 100644
--- a/modules/nixos/mail-server/radicale.nix
+++ b/modules/nixos/mail-server/radicale.nix
@@ -13,13 +13,10 @@ lib.mkIf hasMailDiscoveryConfig (
     domain = builtins.head cfg.domains;
     radicaleHost = "cal.${domain}";
     mailAccounts = cfg.loginAccounts;
-    discoveryHosts = lib.unique (
-      cfg.domains
-      ++ [
-        cfg.fqdn
-        radicaleHost
-      ]
-    );
+    discoveryHosts = lib.unique [
+      cfg.fqdn
+      radicaleHost
+    ];
 
     accountHash =
       mail: account: