diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 93d87f0d09..eaffae116d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -799,7 +799,7 @@ public class FragmentAccount extends FragmentBase {
         else
             encryption = EmailService.ENCRYPTION_SSL;
 
-        args.putString("host", etHost.getText().toString().trim());
+        args.putString("host", etHost.getText().toString().trim().replace(" ", ""));
         args.putInt("encryption", encryption);
         args.putBoolean("insecure", cbInsecure.isChecked());
         args.putString("port", etPort.getText().toString());