diff --git a/system/desktop/mail-stuff.nix b/system/desktop/mail-stuff.nix
index 701114b..f9a21a2 100644
--- a/system/desktop/mail-stuff.nix
+++ b/system/desktop/mail-stuff.nix
@@ -61,26 +61,6 @@ in {
       notmuch.enable = true;
       msmtp = {
         enable = true;
-        # msmtp --serverinfo --tls --tls-certcheck=off -a gmail
-        # tls.fingerprint = "77:2F:E1:F0:1C:9C:00:45:36:D5:0B:25:17:76:AC:7F:0E:79:68:27:8C:E9:E1:F6:BD:DF:F1:6F:1E:8C:85:18";
-        # tls.fingerprint = "3F:B7:F9:7A:AC:9C:D7:C4:2E:8A:C1:F9:90:B5:D7:D1:8E:E2:F7:7D:9D:DB:FA:01:55:27:D2:79:5F:F8:C1:64";
-      };
-    };
-    terranix_org = {
-      primary = false;
-      address = "palo@terranix.org";
-      aliases = [ ];
-      realName = "Ingolf Wagner";
-      userName = "palo@terranix.org";
-      passwordCommand = passcmd "mail/namecheap/palo@terranix.org";
-      smtp = {
-        host = "mail.privateemail.com";
-        port = 465;
-      };
-      notmuch.enable = true;
-      msmtp = {
-        enable = true;
-        # msmtp --serverinfo --tls --tls-certcheck=off -a gmail
       };
     };
     gmail = {
@@ -106,6 +86,23 @@ in {
         key = "42AC51C9482D0834CF488AF1389EC2D64AC71EAC";
       };
     };
+    terranix_org = {
+      primary = false;
+      address = "palo@terranix.org";
+      aliases = [ ];
+      realName = "Ingolf Wagner";
+      userName = "palo@terranix.org";
+      passwordCommand = passcmd "mail/namecheap/palo@terranix.org";
+      smtp = {
+        host = "mail.privateemail.com";
+        port = 465;
+      };
+      notmuch.enable = true;
+      msmtp = {
+        enable = true;
+        # msmtp --serverinfo --tls --tls-certcheck=off -a gmail
+      };
+    };
     ingolf-wagner = {
       primary = false;
       address = "contact@ingolf-wagner.de";
@@ -131,54 +128,6 @@ in {
         key = "42AC51C9482D0834CF488AF1389EC2D64AC71EAC";
       };
     };
-    gaykraft = {
-      primary = false;
-      address = "root@gaykraft.com";
-      aliases = [ ];
-      realName = "Ingolf Wagner";
-      userName = "root@gaykraft.com";
-      passwordCommand = "mail/gaykraft.com/root@gaykraft.com";
-      mbsync = {
-        enable = true;
-        create = "both";
-      };
-      smtp = {
-        host = "mail.gaykraft.com";
-        port = 587;
-        tls.useStartTls = true;
-      };
-      msmtp = {
-        enable = true;
-        # msmtp --serverinfo --tls --tls-certcheck=off -a gaykraft
-        tls.fingerprint =
-          "08:42:73:72:3E:68:7D:55:89:7A:30:02:4B:CD:30:35:F1:6D:3E:7A:DD:A8:B6:84:67:25:37:F0:4F:7F:86:FE";
-      };
-      notmuch.enable = true;
-    };
-    c-base = {
-      primary = false;
-      address = "palo@c-base.org";
-      aliases = [ ];
-      realName = "Ingolf Wagner";
-      userName = "palo";
-      passwordCommand = passcmd "mail/c-base/palo@c-base.org";
-      smtp = {
-        host = "c-mail.c-base.org";
-        port = 465;
-      };
-      notmuch.enable = true;
-      msmtp = {
-        enable = true;
-        # msmtp --serverinfo --tls --tls-certcheck=off -a c-base
-        tls.fingerprint =
-          "9C:82:3B:0F:31:CE:1B:8E:96:00:CC:C9:FF:E7:BE:66:95:92:4F:22:DD:D6:2E:0E:1D:90:76:BE:8E:9E:8E:16";
-      };
-      gpg = {
-        encryptByDefault = true;
-        signByDefault = true;
-        key = "42AC51C9482D0834CF488AF1389EC2D64AC71EAC";
-      };
-    };
   };
 
   # install mail programs