diff --git a/configs/workhorse/mail-fetcher.nix b/configs/workhorse/mail-fetcher.nix
index 009dcc0..046c808 100644
--- a/configs/workhorse/mail-fetcher.nix
+++ b/configs/workhorse/mail-fetcher.nix
@@ -474,6 +474,7 @@ in {
   # configure accounts
   home-manager.users.mailUser.accounts.email = {
     accounts = {
+
       palo_van_dalo-gmx = {
         primary = false;
         address = "palo_van_dalo@gmx.de";
@@ -484,6 +485,7 @@ in {
           "cat ${toString config.krops.userKeys."gmx.palo_van_dalo".target}";
         imap = {
           host = "imap.gmx.net";
+          tls.enable = true;
           port = 993;
         };
         mbsync = {
@@ -492,6 +494,7 @@ in {
         };
         notmuch.enable = true;
       };
+
       ingolf-wagner-gmx = {
         primary = false;
         address = "ingolf.wagner@gmx.de";
@@ -500,9 +503,9 @@ in {
         userName = "ingolf.wagner@gmx.de";
         passwordCommand =
           "cat ${toString config.krops.userKeys."gmx.ingolf_wagner".target}";
-
         imap = {
           host = "imap.gmx.net";
+          tls.enable = true;
           port = 993;
         };
         mbsync = {
@@ -511,6 +514,7 @@ in {
         };
         notmuch.enable = true;
       };
+
       pali_palo = {
         primary = false;
         address = "pali_palo@web.de";
@@ -521,6 +525,7 @@ in {
           "cat ${toString config.krops.userKeys."web.pali_palo".target}";
         imap = {
           host = "imap.web.de";
+          tls.enable = true;
           port = 993;
         };
         mbsync = {
@@ -529,6 +534,7 @@ in {
         };
         notmuch.enable = true;
       };
+
       c-base = {
         primary = false;
         address = "palo@c-base.org";
@@ -579,6 +585,7 @@ in {
         };
         notmuch.enable = true;
       };
+
       gmail = {
         # for google accounts you have to allow 'less secure apps' in accounts.google.com
         primary = true;
@@ -590,6 +597,7 @@ in {
           "cat ${toString config.krops.userKeys."gmail.palipalo9".target}";
         imap = {
           host = "imap.gmail.com";
+          tls.enable = true;
           port = 993;
         };
         mbsync = {
@@ -598,9 +606,9 @@ in {
         };
         notmuch.enable = true;
       };
+
       terranix_org = {
-        # for google accounts you have to allow 'less secure apps' in accounts.google.com
-        primary = true;
+        primary = false;
         address = "palo@terranix.org";
         aliases = [ ];
         realName = "Ingolf Wagner";
@@ -609,6 +617,7 @@ in {
           "cat ${toString config.krops.userKeys."namecheap.terranix.org".target}";
         imap = {
           host = "mail.privateemail.com";
+          tls.enable = true;
           port = 993;
         };
         mbsync = {
@@ -617,6 +626,7 @@ in {
         };
         notmuch.enable = true;
       };
+
       ingolf-wagner-de = {
         primary = false;
         address = "contact@ingolf-wagner.de";
@@ -628,7 +638,8 @@ in {
         imap = {
           host = "securees5.sgcpanel.com";
           port = 993;
-          tls.useStartTls = true;
+          tls.enable = true;
+          #tls.useStartTls = true;
         };
         # make sure the upstream mail is deleted
         getmail = {
@@ -639,6 +650,7 @@ in {
         };
         notmuch.enable = true;
       };
+
     };
   };