diff --git a/res/layout/account_setup_account_type.xml b/res/layout/account_setup_account_type.xml
index b9f845c90..96ce3b535 100644
--- a/res/layout/account_setup_account_type.xml
+++ b/res/layout/account_setup_account_type.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    
+    android:layout_height="fill_parent"
     android:padding="6dip"
-      android:layout_height="fill_parent"
     android:orientation="vertical"
+        android:layout_gravity="center_horizontal|center_vertical"
       >
       <TextView
           android:text="@string/account_setup_account_type_instructions"
@@ -15,6 +15,15 @@
         android:paddingBottom="10dip"
         android:focusable="true"
           />
+    <Button
+        android:id="@+id/imap"
+        android:text="@string/account_setup_account_type_imap_action"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:minWidth="@dimen/button_minWidth"
+        android:layout_gravity="center_horizontal"
+        android:padding="10dip"
+        />
     <Button
         android:id="@+id/pop"
         android:text="@string/account_setup_account_type_pop_action"
@@ -25,15 +34,6 @@
         android:layout_centerInParent="true"
         android:padding="10dip"
         />
-    <Button
-        android:id="@+id/imap"
-        android:text="@string/account_setup_account_type_imap_action"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:minWidth="@dimen/button_minWidth"
-        android:layout_gravity="center_horizontal"
-        android:padding="10dip"
-        />
     <Button
         android:id="@+id/webdav"
         android:text="@string/account_setup_account_type_webdav_action"
diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml
index a9daac7c8..c134e90dd 100644
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@@ -2,10 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_height="fill_parent"
-    android:layout_width="fill_parent">
+    android:layout_width="fill_parent"
+>
 
 <ScrollView
-    android:layout_width="fill_parent"
+    android:layout_width="wrap_content"
     android:layout_height="fill_parent"
     android:layout_marginBottom="54dip" 
     android:padding="6dip"
@@ -14,16 +15,8 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        android:layout_gravity="center_horizontal|center_vertical"
         android:orientation="vertical">
-      <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"
-        android:paddingBottom="10dip"
-        android:focusable="true"
-          />
     <EditText
         android:id="@+id/account_email"
         android:hint="@string/account_setup_basics_email_hint"
diff --git a/res/layout/account_setup_check_settings.xml b/res/layout/account_setup_check_settings.xml
index f6f977843..9f96fad69 100644
--- a/res/layout/account_setup_check_settings.xml
+++ b/res/layout/account_setup_check_settings.xml
@@ -4,14 +4,19 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical">
+<ScrollView
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_marginBottom="54dip"
+    android:padding="6dip"
+    android:fadingEdge="none"
+    android:scrollbarStyle="outsideInset">
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
+    android:layout_gravity="center_horizontal|center_vertical"
     android:layout_height="fill_parent"
     android:padding="6dip"
     android:layout_width="fill_parent">
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="100sp" />
     <TextView
         android:id="@+id/message"
         android:layout_height="wrap_content"
@@ -25,13 +30,10 @@
     <ProgressBar
         android:id="@+id/progress"
         android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="wrap_content"
+        android:layout_gravity="center_horizontal|center_vertical"
         android:focusable="true" />
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
     </LinearLayout>
+    </ScrollView>
     <include layout="@layout/wizard_cancel" />
 </LinearLayout>
diff --git a/res/layout/account_setup_names.xml b/res/layout/account_setup_names.xml
index d78ffac9c..dc0affc3b 100644
--- a/res/layout/account_setup_names.xml
+++ b/res/layout/account_setup_names.xml
@@ -15,38 +15,22 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        android:layout_gravity="center_horizontal|center_vertical"
         android:orientation="vertical">
-    <TextView
-        android:text="@string/account_setup_names_instructions"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorPrimary"
-        android:focusable="true" />
-    <TextView
-        android:text="@string/account_setup_names_account_name_label"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary" />
     <EditText
         android:id="@+id/account_description"
         android:singleLine="true"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
+        android:hint="@string/account_setup_names_account_name_label"
         android:contentDescription="@string/account_setup_names_account_name_label" />
-    <TextView
-        android:text="@string/account_setup_names_user_name_label"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary" />
     <EditText
         android:id="@+id/account_name"
         android:singleLine="true"
         android:inputType="textPersonName"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
+        android:hint="@string/account_setup_names_user_name_label"
         android:contentDescription="@string/account_setup_names_user_name_label" />
     <View
         android:layout_height="0dip"
@@ -67,7 +51,6 @@
             android:text="@string/done_action"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:drawableRight="@drawable/button_indicator_next"
             android:layout_marginBottom="-4dip" 
             android:layout_alignParentRight="true"
             android:layout_centerVertical="false"