diff --git a/machines/moritz-server/mail-server.nix b/machines/moritz-server/mail-server.nix
index 89ceac6..55b931d 100644
--- a/machines/moritz-server/mail-server.nix
+++ b/machines/moritz-server/mail-server.nix
@@ -10,6 +10,8 @@
   ];
   mailserver = {
     enable = true;
+    enableSubmission = false;
+    enableSubmissionSsl = false;
     fqdn = "mail.moritz.place";
     domains = ["moritz.place"];
 
@@ -62,9 +64,7 @@
     hostName = "webmail.moritz.place";
     dicts = with pkgs.aspellDicts; [en de];
     extraConfig = ''
-      # starttls needed for authentication, so the fqdn required to match
-      # the certificate
-      $config['smtp_host'] = "tls://${config.mailserver.fqdn}";
+      $config['smtp_host'] = "tls://mail.smtp2go.com";
       $config['smtp_user'] = "%u";
       $config['smtp_pass'] = "%p";
     '';
diff --git a/modules/moritz/profiles/personal_mail.nix b/modules/moritz/profiles/personal_mail.nix
index 0bbd902..4b3e054 100644
--- a/modules/moritz/profiles/personal_mail.nix
+++ b/modules/moritz/profiles/personal_mail.nix
@@ -53,7 +53,7 @@ in {
         # gpg.signByDefault = true;
         # gpg.key = "0xE4F362A3F5C338A0";
         imap.host = "mail.moritz.place";
-        smtp.host = "mail.moritz.place";
+        smtp.host = "mail.smtp2go.com";
         realName = "Moritz Böhme";
         mbsync.enable = true;
         mbsync.create = "both";