diff --git a/res/values/strings.xml b/res/values/strings.xml
index f5b598da6..f3e44bcc9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -336,6 +336,7 @@ Welcome to K-9 Mail setup.  K-9 is an open source email client for Android based
     <string name="account_setup_failed_dlg_certificate_message_fmt">Cannot safely connect to server.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Cannot safely connect to server\n(Invalid certificate) -->
     <string name="account_setup_failed_dlg_server_message_fmt">Cannot connect to server.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Cannot connect to server\n(Connection timed out) -->
     <string name="account_setup_failed_dlg_edit_details_action">Edit details</string>
+    <string name="account_setup_failed_dlg_continue_action">Continue</string>
 
     <string name="account_settings_title_fmt">General settings</string>
     <string name="account_settings_default">Default account</string>
diff --git a/src/com/android/email/activity/setup/AccountSetupCheckSettings.java b/src/com/android/email/activity/setup/AccountSetupCheckSettings.java
index 44c093274..41676bef5 100644
--- a/src/com/android/email/activity/setup/AccountSetupCheckSettings.java
+++ b/src/com/android/email/activity/setup/AccountSetupCheckSettings.java
@@ -177,6 +177,16 @@ public class AccountSetupCheckSettings extends Activity implements OnClickListen
                         .setTitle(getString(R.string.account_setup_failed_dlg_title))
                         .setMessage(getString(msgResId, args))
                         .setCancelable(true)
+                        .setNegativeButton(
+                                getString(R.string.account_setup_failed_dlg_continue_action),
+
+                                new DialogInterface.OnClickListener() {
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        mCanceled=false;
+                                        setResult(RESULT_OK);
+                                        finish();
+                                    }
+                                })
                         .setPositiveButton(
                                 getString(R.string.account_setup_failed_dlg_edit_details_action),
                                 new DialogInterface.OnClickListener() {