diff --git a/src/com/fsck/k9/EmailAddressValidator.java b/src/com/fsck/k9/EmailAddressValidator.java
index 57c874951..fbaac1136 100644
--- a/src/com/fsck/k9/EmailAddressValidator.java
+++ b/src/com/fsck/k9/EmailAddressValidator.java
@@ -3,6 +3,7 @@ package com.fsck.k9;
 
 import java.util.regex.Pattern;
 
+import android.text.util.Rfc822Tokenizer;
 import android.widget.AutoCompleteTextView.Validator;
 
 public class EmailAddressValidator implements Validator
@@ -20,6 +21,11 @@ public class EmailAddressValidator implements Validator
     }
 
     public boolean isValid(CharSequence text)
+    {
+        return Rfc822Tokenizer.tokenize(text).length > 0;
+    }
+
+    public boolean isValidAddressOnly(CharSequence text)
     {
         return p.matcher(text).matches();
     }
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
index 83853ca0d..aebbacfe3 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
@@ -133,7 +133,7 @@ public class AccountSetupBasics extends K9Activity
         String email = mEmailView.getText().toString();
         boolean valid = Utility.requiredFieldValid(mEmailView)
                         && Utility.requiredFieldValid(mPasswordView)
-                        && mEmailValidator.isValid(email);
+                        && mEmailValidator.isValidAddressOnly(email);
 
         mNextButton.setEnabled(valid);
         mManualSetupButton.setEnabled(valid);