diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix
index 286fdf6..0ad1179 100644
Binary files a/git-crypt/secrets.nix and b/git-crypt/secrets.nix differ
diff --git a/home-modules/email.nix b/home-modules/email.nix
index 02d5f9e..cd56500 100644
--- a/home-modules/email.nix
+++ b/home-modules/email.nix
@@ -187,14 +187,17 @@
       userName = "lennart@${hyper.domain}";
       realName = "Lennart J. Kurzweg";
       imap = {
-        port = 143;
-        host = "mail.${hyper.domain}";
-        tls.useStartTls = true;
+        port = 993;
+        host = "ssh.${hyper.domain}";
+        tls.enable = true;
       };
       smtp = {
-        port = 587;
-        host = "mail.${hyper.domain}";
-        tls.useStartTls = true;
+        port = 465;
+        host = "mail-eu.smtp2go.com";
+        tls.enable = true;
+        # port = 587;
+        # host = "mail.${hyper.domain}";
+        # tls.useStartTls = true;
       };
       signature = {
         text = ''
diff --git a/home-modules/ssh.nix b/home-modules/ssh.nix
index 7bf978b..3046f5a 100644
--- a/home-modules/ssh.nix
+++ b/home-modules/ssh.nix
@@ -36,6 +36,12 @@
       "nxace"                            = (nxace "nxace" );
       "nxacel"                           = (nxace "nxacel") // { hostname = "10.0.1.1"; };
       "nxrpli"                           = (nxace "nxrpil") // { hostname = "10.0.1.31"; port = 22; };
+      "nx2s-email-relay" = default // {
+        identityFile = "${hyper.home}/vault/ssh/nx2s-email-relay";
+        host = "35.243.218.208";
+        port = 22;
+        user = secrets.ssh.nx2s-email-relay-user;
+      };
     };
   };
   services.ssh-agent = {