diff --git a/res/layout/account_setup_account_type.xml b/res/layout/account_setup_account_type.xml
index 3c30e257d..919b86c93 100644
--- a/res/layout/account_setup_account_type.xml
+++ b/res/layout/account_setup_account_type.xml
@@ -31,6 +31,7 @@
         android:text="@string/account_setup_account_type_pop_action"
         android:layout_height="wrap_content"
         android:layout_width="150sp"
+        android:layout_marginTop="25dip"
         android:minWidth="@dimen/button_minWidth"
         android:layout_gravity="center_horizontal"
         />
@@ -39,6 +40,7 @@
         android:text="@string/account_setup_account_type_imap_action"
         android:layout_height="wrap_content"
         android:layout_width="150sp"
+        android:layout_marginTop="25dip"
         android:minWidth="@dimen/button_minWidth"
         android:layout_gravity="center_horizontal"
         />
@@ -47,6 +49,7 @@
         android:text="@string/account_setup_account_type_exchange_action"
         android:layout_height="wrap_content"
         android:layout_width="150sp"
+        android:layout_marginTop="25dip"
         android:minWidth="@dimen/button_minWidth"
         android:layout_gravity="center_horizontal"
         android:visibility="gone"
diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml
index 86e6bd282..0603be5ca 100644
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@@ -31,8 +31,10 @@
             android:layout_weight="1"
             android:orientation="vertical" >
             <TextView
+                android:id="@+id/instructions"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="10dip"
                 android:textSize="20sp"
                 android:text="@string/accounts_welcome"
                 android:textColor="?android:attr/textColorPrimary" />
@@ -40,12 +42,6 @@
                 android:layout_width="fill_parent"
                 android:layout_height="0dip"
                 android:layout_weight="1" />
-            <TextView
-                android:text="@string/account_setup_basics_instructions"
-                android:layout_height="wrap_content"
-                android:layout_width="fill_parent"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorPrimary" />
             <EditText
                 android:id="@+id/account_email"
                 android:hint="@string/account_setup_basics_email_hint"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7affc8fe1..5f29ee3a6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -267,9 +267,14 @@
     <!-- Title of screen when setting up new email account -->
     <string name="account_setup_basics_title">Set up email</string>
     <!-- On "Set up email" screen, enthusiastic welcome message. -->
-    <string name="accounts_welcome">Welcome to Email setup!\n\nUse any email account with Email.  Most popular email accounts can be set up in 2 steps!</string>
+    <string name="accounts_welcome">You can configure Email for most accounts in just a few steps.
+        </string>
+    <!-- On "Set up email" screen, enthusiastic welcome message (in EAS mode). -->
+    <string name="accounts_welcome_exchange">You can configure an Exchange account in just a few
+        steps.</string>
     <!-- On "Set up email" screen, brief instructions -->
-    <string name="account_setup_basics_instructions">To begin, type your email address and password:</string>
+    <!--  DEPRECATED - REMOVE -->
+    <string name="account_setup_basics_instructions"></string>
     <!-- On "Set up email" screen, hint for account email address text field -->
     <string name="account_setup_basics_email_hint">Email address</string>
     <!-- On "Set up email" screen, hint for account email password text field -->
@@ -317,7 +322,7 @@
     <!-- "Add new email account" screen, button name in response to what type of account this is -->
     <string name="account_setup_account_type_imap_action">IMAP account</string>
     <!-- "Add new email account" screen, button name in response to what type of account this is -->
-    <string name="account_setup_account_type_exchange_action">Exchange/ActiveSync</string>
+    <string name="account_setup_account_type_exchange_action">Exchange account</string>
     <!-- "Incoming server settings" screen, label for text field -->
     <string name="account_setup_incoming_title">Incoming server settings</string>
     <!-- "Incoming server settings" screen, label for text field -->
diff --git a/src/com/android/email/activity/setup/AccountSetupBasics.java b/src/com/android/email/activity/setup/AccountSetupBasics.java
index 4f9ad22bc..b42345d5a 100644
--- a/src/com/android/email/activity/setup/AccountSetupBasics.java
+++ b/src/com/android/email/activity/setup/AccountSetupBasics.java
@@ -41,6 +41,7 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import java.io.Serializable;
@@ -133,8 +134,11 @@ public class AccountSetupBasics extends Activity
 
         mEasFlowMode = getIntent().getBooleanExtra(EXTRA_EAS_FLOW, false);
         if (mEasFlowMode) {
+            // No need for manual button -> next is appropriate
             mManualSetupButton.setVisibility(View.GONE);
-            // TODO: probably need different text here
+            // Swap welcome text for EAS-specific text
+            TextView welcomeView = (TextView) findViewById(R.id.instructions);
+            welcomeView.setText(R.string.accounts_welcome_exchange);
         }
 
         if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_ACCOUNT)) {