diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 1a45319852..ed4b70018c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -429,10 +429,10 @@ public class FragmentIdentity extends FragmentEx {
                 Bundle args = new Bundle();
                 args.putLong("id", id);
                 args.putString("name", name);
-                args.putString("email", etEmail.getText().toString());
+                args.putString("email", etEmail.getText().toString().trim());
                 args.putString("display", etDisplay.getText().toString());
-                args.putString("replyto", etReplyTo.getText().toString());
-                args.putString("bcc", etBcc.getText().toString());
+                args.putString("replyto", etReplyTo.getText().toString().trim());
+                args.putString("bcc", etBcc.getText().toString().trim());
                 args.putBoolean("delivery_receipt", cbDeliveryReceipt.isChecked());
                 args.putBoolean("read_receipt", cbReadReceipt.isChecked());
                 args.putLong("account", account == null ? -1 : account.id);
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 814bd2d0f2..3407f3cd42 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -195,7 +195,7 @@ public class FragmentSetup extends FragmentEx {
             public void onClick(View v) {
                 Bundle args = new Bundle();
                 args.putString("name", etName.getText().toString());
-                args.putString("email", etEmail.getText().toString());
+                args.putString("email", etEmail.getText().toString().trim());
                 args.putString("password", tilPassword.getEditText().getText().toString());
 
                 new SimpleTask<Void>() {