diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3776a8110..89c709c84 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -165,7 +165,10 @@
 
         <activity
             android:name=".activity.setup.AccountCredentials"
-            android:label="@string/sign_in_title">
+            android:label="@string/sign_in_title"
+            android:exported="false"
+            android:excludeFromRecents="true"
+            android:theme="@style/AccountSetupDialogActivityTheme">
         </activity>
 
         <activity
@@ -301,10 +304,12 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.setup.AccountServerSettingsActivity"
-                  android:label="@string/mailbox_settings_activity_title"
-                  android:exported="false">
-        </activity>
+        <activity
+            android:name=".activity.setup.AccountServerSettingsActivity"
+            android:label="@string/mailbox_settings_activity_title"
+            android:exported="false"
+            android:excludeFromRecents="true"
+            android:theme="@style/AccountSetupDialogActivityTheme" />
         <!-- a Headless Activity to load the account from the account id before navigating to the
         Incoming Account Settings fragment -->
         <activity
diff --git a/res/layout/account_credentials_fragment.xml b/res/layout/account_credentials_fragment.xml
index babf73964..bdb1a4a91 100644
--- a/res/layout/account_credentials_fragment.xml
+++ b/res/layout/account_credentials_fragment.xml
@@ -13,20 +13,30 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent" >
-    <LinearLayout
-            style="@style/account_setup_fragment_container"
-            android:layout_width="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:divider="?android:attr/dividerHorizontal"
+    android:showDividers="middle" >
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:paddingTop="@dimen/settings_fragment_padding_top" >
+
+        <FrameLayout
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:paddingLeft="@dimen/settings_fragment_padding_side"
+            android:paddingRight="@dimen/settings_fragment_padding_side" >
 
-        <include
-                layout="@layout/account_setup_credentials_fragment"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+            <include layout="@layout/account_setup_credentials_fragment" />
 
-        <include layout="@layout/account_settings_buttons" />
-    </LinearLayout>
-</ScrollView>
+        </FrameLayout>
+
+    </ScrollView>
+
+    <include layout="@layout/account_settings_buttons"/>
+</LinearLayout>
diff --git a/res/layout/account_server_settings.xml b/res/layout/account_server_settings.xml
index bc7fb86e9..e84f034e0 100644
--- a/res/layout/account_server_settings.xml
+++ b/res/layout/account_server_settings.xml
@@ -14,9 +14,7 @@
      limitations under the License.
 -->
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:id="@+id/account_server_settings_container">
-
-</ScrollView>
+            android:id="@+id/account_server_settings_container" />
diff --git a/res/layout/account_settings_buttons.xml b/res/layout/account_settings_buttons.xml
index 81e9522a4..af6280e3e 100644
--- a/res/layout/account_settings_buttons.xml
+++ b/res/layout/account_settings_buttons.xml
@@ -18,19 +18,20 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingTop="@dimen/settings_buttons_padding_top"
-    android:paddingBottom="@dimen/settings_buttons_padding_bottom">
+    style="?android:attr/buttonBarStyle" >
 
     <Button
         android:id="@+id/cancel"
-        style="@style/account_settings_button"
-        android:layout_width="0dip"
+        android:layout_width="0dp"
+        android:layout_height="48sp"
         android:layout_weight="1"
-        android:text="@android:string/cancel" />
+        android:text="@android:string/cancel"
+        style="?android:attr/buttonBarButtonStyle" />
     <Button
         android:id="@+id/done"
-        style="@style/account_settings_button"
-        android:layout_width="0dip"
+        android:layout_width="0dp"
+        android:layout_height="48sp"
         android:layout_weight="1"
-        android:text="@string/done" />
-</LinearLayout>
\ No newline at end of file
+        android:text="@string/done"
+        style="?android:attr/buttonBarButtonStyle" />
+</LinearLayout>
diff --git a/res/layout/account_settings_incoming_fragment.xml b/res/layout/account_settings_incoming_fragment.xml
index f4ad89c53..0766b71d4 100644
--- a/res/layout/account_settings_incoming_fragment.xml
+++ b/res/layout/account_settings_incoming_fragment.xml
@@ -15,38 +15,31 @@
 -->
 
 <!-- Incoming server settings.  This is a wrapper around the "incoming setup" fragment
-     that adds scrollview & buttons and makes it more compatible with a 2-pane PreferenceActivity
-     such as AccountSettingsXL. -->
-<ScrollView  xmlns:android="http://schemas.android.com/apk/res/android"
+     that adds scrollview & buttons -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true"
-    >
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/settings_fragment_padding_top"
-        android:paddingLeft="@dimen/settings_fragment_padding_side"
-        android:paddingRight="@dimen/settings_fragment_padding_side"
-        >
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:divider="?android:attr/dividerHorizontal"
+    android:showDividers="middle" >
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:paddingTop="@dimen/settings_fragment_padding_top" >
 
-        <!-- Fields entry -->
         <FrameLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            >
-            <include
-                layout="@layout/account_setup_incoming_fragment"
-                />
+            android:paddingLeft="@dimen/settings_fragment_padding_side"
+            android:paddingRight="@dimen/settings_fragment_padding_side" >
+
+            <include layout="@layout/account_setup_incoming_fragment" />
+
         </FrameLayout>
 
-        <!-- This spacer fills the viewport and moves the buttons to the bottom -->
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1" />
+    </ScrollView>
 
-        <include layout="@layout/account_settings_buttons" />
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+    <include layout="@layout/account_settings_buttons"/>
+</LinearLayout>
diff --git a/res/layout/account_settings_outgoing_fragment.xml b/res/layout/account_settings_outgoing_fragment.xml
index 3b31f44b7..b2d81a52b 100644
--- a/res/layout/account_settings_outgoing_fragment.xml
+++ b/res/layout/account_settings_outgoing_fragment.xml
@@ -15,38 +15,31 @@
 -->
 
 <!-- Outgoing server settings.  This is a wrapper around the "outgoing setup" fragment
-     that adds scrollview & buttons and makes it more compatible with a 2-pane PreferenceActivity
-     such as AccountSettingsXL. -->
-<ScrollView  xmlns:android="http://schemas.android.com/apk/res/android"
+     that adds scrollview & buttons -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true"
-    >
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/settings_fragment_padding_top"
-        android:paddingLeft="@dimen/settings_fragment_padding_side"
-        android:paddingRight="@dimen/settings_fragment_padding_side"
-        >
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:divider="?android:attr/dividerHorizontal"
+    android:showDividers="middle" >
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:paddingTop="@dimen/settings_fragment_padding_top" >
 
-        <!-- Fields entry -->
         <FrameLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            >
-            <include
-                layout="@layout/account_setup_outgoing_fragment"
-                />
+            android:paddingLeft="@dimen/settings_fragment_padding_side"
+            android:paddingRight="@dimen/settings_fragment_padding_side" >
+
+            <include layout="@layout/account_setup_outgoing_fragment" />
+
         </FrameLayout>
 
-        <!-- This spacer fills the viewport and moves the buttons to the bottom -->
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1" />
+    </ScrollView>
 
-        <include layout="@layout/account_settings_buttons" />
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+    <include layout="@layout/account_settings_buttons"/>
+</LinearLayout>
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
new file mode 100644
index 000000000..54117d40a
--- /dev/null
+++ b/res/values-v21/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <style name="AccountSetupDialogActivityTheme"
+        parent="@android:style/Theme.Material.Light.Dialog.NoActionBar">
+        <!-- ActionBar color -->
+        <item name="android:colorPrimary">@color/actionbar_color</item>
+        <!-- Used by the StatusBar and NavBar (currently broken?) -->
+        <item name="android:colorPrimaryDark">@color/statusbar_color</item>
+        <item name="android:colorAccent">@color/accent_blue</item>
+    </style>
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5460c9d54..84013b20f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,6 +15,8 @@
 -->
 
 <resources>
+    <style name="AccountSetupDialogActivityTheme"
+        parent="@android:style/Theme.Holo.Light.Dialog.NoActionBar" />
     <!-- Account Setup Activity -->
     <style name="account_setup_content">
         <item name="android:background">@drawable/account_setup_background</item>
diff --git a/src/com/android/email/activity/setup/AccountCredentials.java b/src/com/android/email/activity/setup/AccountCredentials.java
index a58f18362..39784198e 100644
--- a/src/com/android/email/activity/setup/AccountCredentials.java
+++ b/src/com/android/email/activity/setup/AccountCredentials.java
@@ -32,6 +32,8 @@ public class AccountCredentials extends Activity
         final String emailAddress = getIntent().getStringExtra(EXTRA_EMAIL);
         final String protocol = getIntent().getStringExtra(EXTRA_PROTOCOL);
 
+        setFinishOnTouchOutside(false);
+
         if (savedInstanceState == null) {
             final AccountSetupCredentialsFragment f =
                     AccountSetupCredentialsFragment.newInstance(emailAddress, protocol,
diff --git a/src/com/android/email/activity/setup/AccountServerSettingsActivity.java b/src/com/android/email/activity/setup/AccountServerSettingsActivity.java
index fffa15a7f..b0782570e 100644
--- a/src/com/android/email/activity/setup/AccountServerSettingsActivity.java
+++ b/src/com/android/email/activity/setup/AccountServerSettingsActivity.java
@@ -67,8 +67,8 @@ public class AccountServerSettingsActivity extends AccountSetupActivity implemen
 
         mSetupData.setFlowMode(SetupDataFragment.FLOW_MODE_EDIT);
 
-        // TODO: this activity is ugly as sin
         setContentView(R.layout.account_server_settings);
+        setFinishOnTouchOutside(false);
 
         if (savedInstanceState == null) {
             final Account account = getIntent().getParcelableExtra(EXTRA_ACCOUNT);