diff --git a/modules/home-manager/thunderbird.nix b/modules/home-manager/thunderbird.nix
index 8243e89..caad0d2 100644
--- a/modules/home-manager/thunderbird.nix
+++ b/modules/home-manager/thunderbird.nix
@@ -47,13 +47,51 @@
           useStartTls = true;
         };
       };
-      thunderbird = {
-        enable = true;
-        settings = id: {
-          "mail.smtpserver.smtp_${id}.authMethod" = 10;
-          "mail.server.server_${id}.authMethod" = 10;
+      thunderbird.enable = true;
+    };
+    "luhbots" = {
+      address = "max.kaenner@luhbots.de";
+      userName = "max.kaenner@luhbots.de";
+      realName = "Max Känner";
+      imap = {
+        host = "luhbots.de";
+        port = 993;
+        tls = {
+          enable = true;
+          useStartTls = false;
         };
       };
+      smtp = {
+        host = "luhbots.de";
+        port = 587;
+        tls = {
+          enable = true;
+          useStartTls = true;
+        };
+      };
+      thunderbird.enable = true;
+    };
+    "gymstolz" = {
+      address = "max.kaenner@gym-stolz.de";
+      userName = "max.kaenner@gym-stolz.de";
+      realName = "Max Känner";
+      imap = {
+        host = "gym-stolz.de";
+        port = 993;
+        tls = {
+          enable = true;
+          useStartTls = true;
+        };
+      };
+      smtp = {
+        host = "gym-stolz.de";
+        port = 587;
+        tls = {
+          enable = true;
+          useStartTls = true;
+        };
+      };
+      thunderbird.enable = true;
     };
   };