diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml
index f21236c94..86e6bd282 100644
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@@ -14,78 +14,86 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
-    <TextView
+    android:fillViewport="true"
+    android:scrollbarStyle="outsideInset" >
+
+    <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="20sp"
-        android:text="@string/accounts_welcome"
-        android:textColor="?android:attr/textColorPrimary" />
-    <View
-        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"
-        android:inputType="textEmailAddress"
-        android:imeOptions="actionNext"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        />
-    <EditText
-        android:id="@+id/account_password"
-        android:hint="@string/account_setup_basics_password_hint"
-        android:inputType="textPassword"
-        android:imeOptions="actionDone"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:nextFocusDown="@+id/next"
-        />
-    <CheckBox
-        android:id="@+id/account_default"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:text="@string/account_setup_basics_default_label"
-        android:visibility="gone"
-        />
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        />
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="54dip"
-        android:background="@android:drawable/bottom_bar"
-        >
-        <Button
-            android:id="@+id/manual_setup"
-            android:text="@string/account_setup_basics_manual_setup_action"
+        android:layout_height="fill_parent"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            />
-        <Button
-            android:id="@+id/next"
-            android:text="@string/next_action"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
-            android:drawableRight="@drawable/button_indicator_next"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            />
-    </RelativeLayout>
-</LinearLayout>
+            android:layout_weight="1"
+            android:orientation="vertical" >
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:textSize="20sp"
+                android:text="@string/accounts_welcome"
+                android:textColor="?android:attr/textColorPrimary" />
+            <View
+                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"
+                android:inputType="textEmailAddress"
+                android:imeOptions="actionNext"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <EditText
+                android:id="@+id/account_password"
+                android:hint="@string/account_setup_basics_password_hint"
+                android:inputType="textPassword"
+                android:imeOptions="actionDone"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:nextFocusDown="@+id/next" />
+            <CheckBox
+                android:id="@+id/account_default"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:text="@string/account_setup_basics_default_label"
+                android:visibility="gone" />
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1" />
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="54dip"
+            android:background="@android:drawable/bottom_bar" >
+            <Button
+                android:id="@+id/manual_setup"
+                android:text="@string/account_setup_basics_manual_setup_action"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:minWidth="@dimen/button_minWidth"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true" />
+            <Button
+                android:id="@+id/next"
+                android:text="@string/next_action"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:minWidth="@dimen/button_minWidth"
+                android:drawableRight="@drawable/button_indicator_next"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true" />
+        </RelativeLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/account_setup_check_settings.xml b/res/layout/account_setup_check_settings.xml
index 464b67d41..fce3de14c 100644
--- a/res/layout/account_setup_check_settings.xml
+++ b/res/layout/account_setup_check_settings.xml
@@ -14,41 +14,49 @@
      limitations under the License.
 -->
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical">
-    <View
+    android:fillViewport="true"
+    android:scrollbarStyle="outsideInset" >
+
+    <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="100sp" />
-    <TextView
-        android:id="@+id/message"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:gravity="center_horizontal"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorPrimary"
-        android:paddingBottom="6dip" />
-    <ProgressBar
-        android:id="@+id/progress"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        style="?android:attr/progressBarStyleHorizontal" />
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="54dip"
-        android:background="@android:drawable/bottom_bar">
-        <Button
-            android:id="@+id/cancel"
-            android:text="@string/cancel_action"
+        android:layout_height="fill_parent"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
-            android:layout_centerVertical="true" />
-    </RelativeLayout>
-</LinearLayout>
+            android:layout_weight="1"
+            android:paddingTop="100dip"
+            android:orientation="vertical" >
+            <TextView
+                android:id="@+id/message"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:gravity="center_horizontal"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="?android:attr/textColorPrimary"
+                android:paddingBottom="6dip" />
+            <ProgressBar
+                android:id="@+id/progress"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                style="?android:attr/progressBarStyleHorizontal" />
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="54dip"
+            android:background="@android:drawable/bottom_bar">
+            <Button
+                android:id="@+id/cancel"
+                android:text="@string/cancel_action"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:minWidth="@dimen/button_minWidth"
+                android:layout_centerVertical="true" />
+        </RelativeLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/account_setup_exchange.xml b/res/layout/account_setup_exchange.xml
index b8aadd5db..4173bcf00 100644
--- a/res/layout/account_setup_exchange.xml
+++ b/res/layout/account_setup_exchange.xml
@@ -19,72 +19,76 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:fillViewport="true"
-    android:scrollbarStyle="outsideInset">
+    android:scrollbarStyle="outsideInset" >
+
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:orientation="vertical">
-        <TextView
-            android:text="@string/account_setup_incoming_username_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_username"
-            android:inputType="textEmailAddress"
-            android:imeOptions="actionDone"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-        <TextView
-            android:text="@string/account_setup_incoming_password_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_password"
-            android:inputType="textPassword"
-            android:imeOptions="actionDone"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-        <!-- This text may be changed in code if the server is IMAP, etc. -->
-        <TextView
-            android:text="@string/account_setup_exchange_server_label"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorPrimary" />
-        <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
-        <EditText
-            android:id="@+id/account_server"
-            android:inputType="textUri"
-            android:imeOptions="actionDone"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-        <TextView
-            android:text="@string/account_setup_exchange_domain_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_domain"
-            android:hint="@string/account_setup_exchange_domain_hint"
-            inputType="text"
-            android:imeOptions="actionDone"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-        <CheckBox
-            android:id="@+id/account_ssl"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:text="@string/account_setup_exchange_ssl_label" />
+        android:orientation="vertical" >
 
-        <View
+        <LinearLayout
             android:layout_width="fill_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1" />
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical" >
+            <TextView
+                android:text="@string/account_setup_incoming_username_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_username"
+                android:inputType="textEmailAddress"
+                android:imeOptions="actionDone"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <TextView
+                android:text="@string/account_setup_incoming_password_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_password"
+                android:inputType="textPassword"
+                android:imeOptions="actionDone"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <!-- This text may be changed in code if the server is IMAP, etc. -->
+            <TextView
+                android:text="@string/account_setup_exchange_server_label"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorPrimary" />
+            <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
+            <EditText
+                android:id="@+id/account_server"
+                android:inputType="textUri"
+                android:imeOptions="actionDone"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <TextView
+                android:text="@string/account_setup_exchange_domain_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_domain"
+                android:hint="@string/account_setup_exchange_domain_hint"
+                inputType="text"
+                android:imeOptions="actionDone"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <CheckBox
+                android:id="@+id/account_ssl"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:text="@string/account_setup_exchange_ssl_label" />
+        </LinearLayout>
+
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="54dip"
diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml
index 0ddf649d3..aed1ee062 100644
--- a/res/layout/account_setup_incoming.xml
+++ b/res/layout/account_setup_incoming.xml
@@ -18,106 +18,112 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:scrollbarStyle="outsideInset">
+    android:fillViewport="true"
+    android:scrollbarStyle="outsideInset" >
+
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:orientation="vertical">
-        <TextView
-            android:text="@string/account_setup_incoming_username_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_username"
-            android:inputType="textEmailAddress"
-            android:imeOptions="actionDone"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-        <TextView
-            android:text="@string/account_setup_incoming_password_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_password"
-            android:inputType="textPassword"
-            android:imeOptions="actionDone"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-        <!-- This text may be changed in code if the server is IMAP, etc. -->
-        <TextView
-            android:id="@+id/account_server_label"
-            android:text="@string/account_setup_incoming_pop_server_label"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorPrimary" />
-        <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
-        <EditText
-            android:id="@+id/account_server"
-            android:inputType="textUri"
-            android:imeOptions="actionDone"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-        <TextView
-            android:text="@string/account_setup_incoming_port_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_port"
-            android:inputType="number"
-            android:imeOptions="actionDone"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-        <TextView
-            android:text="@string/account_setup_incoming_security_label"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorPrimary" />
-        <Spinner
-            android:id="@+id/account_security_type"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-        <TextView
-            android:id="@+id/account_delete_policy_label"
-            android:text="@string/account_setup_incoming_delete_policy_label"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorPrimary" />
-        <Spinner
-            android:id="@+id/account_delete_policy"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
+        android:orientation="vertical" >
+
         <LinearLayout
-            android:id="@+id/imap_path_prefix_section"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_weight="1"
+            android:orientation="vertical" >
             <TextView
-                android:text="@string/account_setup_incoming_imap_path_prefix_label"
+                android:text="@string/account_setup_incoming_username_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/imap_path_prefix"
-                android:hint="@string/account_setup_incoming_imap_path_prefix_hint"
-                inputType="text"
+                android:id="@+id/account_username"
+                android:inputType="textEmailAddress"
                 android:imeOptions="actionDone"
                 android:layout_height="wrap_content"
                 android:layout_width="fill_parent" />
+            <TextView
+                android:text="@string/account_setup_incoming_password_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_password"
+                android:inputType="textPassword"
+                android:imeOptions="actionDone"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <!-- This text may be changed in code if the server is IMAP, etc. -->
+            <TextView
+                android:id="@+id/account_server_label"
+                android:text="@string/account_setup_incoming_pop_server_label"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorPrimary" />
+            <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
+            <EditText
+                android:id="@+id/account_server"
+                android:inputType="textUri"
+                android:imeOptions="actionDone"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <TextView
+                android:text="@string/account_setup_incoming_port_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_port"
+                android:inputType="number"
+                android:imeOptions="actionDone"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <TextView
+                android:text="@string/account_setup_incoming_security_label"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorPrimary" />
+            <Spinner
+                android:id="@+id/account_security_type"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <TextView
+                android:id="@+id/account_delete_policy_label"
+                android:text="@string/account_setup_incoming_delete_policy_label"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorPrimary" />
+            <Spinner
+                android:id="@+id/account_delete_policy"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <LinearLayout
+                android:id="@+id/imap_path_prefix_section"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+                <TextView
+                    android:text="@string/account_setup_incoming_imap_path_prefix_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/imap_path_prefix"
+                    android:hint="@string/account_setup_incoming_imap_path_prefix_hint"
+                    inputType="text"
+                    android:imeOptions="actionDone"
+                    android:layout_height="wrap_content"
+                    android:layout_width="fill_parent" />
+            </LinearLayout>
         </LinearLayout>
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1" />
+
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="54dip"
diff --git a/res/layout/account_setup_names.xml b/res/layout/account_setup_names.xml
index fca00e1a8..e31732da8 100644
--- a/res/layout/account_setup_names.xml
+++ b/res/layout/account_setup_names.xml
@@ -14,56 +14,65 @@
      limitations under the License.
 -->
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical">
-    <TextView
-        android:text="@string/account_setup_names_instructions"
-        android:layout_height="wrap_content"
+    android:fillViewport="true"
+    android:scrollbarStyle="outsideInset" >
+
+    <LinearLayout
         android:layout_width="fill_parent"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorPrimary" />
-    <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:inputType="textCapWords"
-        android:imeOptions="actionDone"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent" />
-    <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:inputType="textPersonName"
-        android:imeOptions="actionDone"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent" />
-    <View
-        android:layout_height="0dip"
-        android:layout_width="fill_parent"
-        android:layout_weight="1" />
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="54dip"
-        android:background="@android:drawable/bottom_bar">
-        <Button
-            android:id="@+id/done"
-            android:text="@string/done_action"
+        android:layout_height="fill_parent"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true" />
-    </RelativeLayout>
-</LinearLayout>
+            android:layout_weight="1"
+            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" />
+            <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:inputType="textCapWords"
+                android:imeOptions="actionDone"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <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:inputType="textPersonName"
+                android:imeOptions="actionDone"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+        </LinearLayout>
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="54dip"
+            android:background="@android:drawable/bottom_bar">
+            <Button
+                android:id="@+id/done"
+                android:text="@string/done_action"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:minWidth="@dimen/button_minWidth"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true" />
+        </RelativeLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/account_setup_options.xml b/res/layout/account_setup_options.xml
index 6df515b84..a3075e7bc 100644
--- a/res/layout/account_setup_options.xml
+++ b/res/layout/account_setup_options.xml
@@ -14,66 +14,77 @@
      limitations under the License.
 -->
 
-<LinearLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical">
-    <TextView
-        android:text="@string/account_setup_options_mail_check_frequency_label"
-        android:layout_height="wrap_content"
+    android:fillViewport="true"
+    android:scrollbarStyle="outsideInset" >
+
+    <LinearLayout
         android:layout_width="fill_parent"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary" />
-    <Spinner
-        android:id="@+id/account_check_frequency"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent" />
-    <TextView
-        android:id="@+id/account_sync_window_label"
-        android:text="@string/account_setup_options_mail_window_label"
-        android:visibility="gone"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary" />
-    <Spinner
-        android:id="@+id/account_sync_window"
-        android:visibility="gone"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent" />
-    <CheckBox
-        android:id="@+id/account_default"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:text="@string/account_setup_options_default_label" />
-    <CheckBox
-        android:id="@+id/account_notify"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:text="@string/account_setup_options_notify_label" />
-    <CheckBox
-        android:id="@+id/account_sync_contacts"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:text="@string/account_setup_options_sync_contacts_label"
-        android:visibility="gone" />
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="54dip"
-        android:background="@android:drawable/bottom_bar">
-        <Button
-            android:id="@+id/next"
-            android:text="@string/next_action"
+        android:layout_height="fill_parent"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
-            android:drawableRight="@drawable/button_indicator_next"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true" />
-    </RelativeLayout>
-</LinearLayout>
+            android:layout_weight="1"
+            android:orientation="vertical" >
+            <TextView
+                android:text="@string/account_setup_options_mail_check_frequency_label"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorPrimary" />
+            <Spinner
+                android:id="@+id/account_check_frequency"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <TextView
+                android:id="@+id/account_sync_window_label"
+                android:text="@string/account_setup_options_mail_window_label"
+                android:visibility="gone"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorPrimary" />
+            <Spinner
+                android:id="@+id/account_sync_window"
+                android:visibility="gone"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <CheckBox
+                android:id="@+id/account_default"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:text="@string/account_setup_options_default_label" />
+            <CheckBox
+                android:id="@+id/account_notify"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:text="@string/account_setup_options_notify_label" />
+            <CheckBox
+                android:id="@+id/account_sync_contacts"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:text="@string/account_setup_options_sync_contacts_label"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="54dip"
+            android:background="@android:drawable/bottom_bar">
+            <Button
+                android:id="@+id/next"
+                android:text="@string/next_action"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:minWidth="@dimen/button_minWidth"
+                android:drawableRight="@drawable/button_indicator_next"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true" />
+        </RelativeLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/account_setup_outgoing.xml b/res/layout/account_setup_outgoing.xml
index ab061ee45..a36162fa8 100644
--- a/res/layout/account_setup_outgoing.xml
+++ b/res/layout/account_setup_outgoing.xml
@@ -18,86 +18,91 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:scrollbarStyle="outsideInset">
+    android:fillViewport="true"
+    android:scrollbarStyle="outsideInset" >
+
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:orientation="vertical">
-        <TextView
-            android:text="@string/account_setup_outgoing_smtp_server_label"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorPrimary" />
-        <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
-        <EditText
-            android:id="@+id/account_server"
-            android:inputType="textUri"
-            android:imeOptions="actionDone"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-        <TextView
-            android:text="@string/account_setup_outgoing_port_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_port"
-            android:inputType="number"
-            android:imeOptions="actionDone"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-        <TextView
-            android:text="@string/account_setup_outgoing_security_label"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorPrimary" />
-        <Spinner
-            android:id="@+id/account_security_type"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-        <CheckBox
-            android:id="@+id/account_require_login"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/account_setup_outgoing_require_login_label" />
+        android:orientation="vertical" >
+
         <LinearLayout
-            android:id="@+id/account_require_login_settings"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="vertical"
-            android:visibility="gone">
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical" >
             <TextView
-                android:text="@string/account_setup_outgoing_username_label"
+                android:text="@string/account_setup_outgoing_smtp_server_label"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorPrimary" />
+            <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
+            <EditText
+                android:id="@+id/account_server"
+                android:inputType="textUri"
+                android:imeOptions="actionDone"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+            <TextView
+                android:text="@string/account_setup_outgoing_port_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_username"
-                android:inputType="textEmailAddress"
+                android:id="@+id/account_port"
+                android:inputType="number"
                 android:imeOptions="actionDone"
                 android:layout_height="wrap_content"
                 android:layout_width="fill_parent" />
             <TextView
-                android:text="@string/account_setup_outgoing_password_label"
+                android:text="@string/account_setup_outgoing_security_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_password"
-                android:inputType="textPassword"
-                android:imeOptions="actionDone"
+            <Spinner
+                android:id="@+id/account_security_type"
                 android:layout_height="wrap_content"
                 android:layout_width="fill_parent" />
+            <CheckBox
+                android:id="@+id/account_require_login"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/account_setup_outgoing_require_login_label" />
+            <LinearLayout
+                android:id="@+id/account_require_login_settings"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:orientation="vertical"
+                android:visibility="gone">
+                <TextView
+                    android:text="@string/account_setup_outgoing_username_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_username"
+                    android:inputType="textEmailAddress"
+                    android:imeOptions="actionDone"
+                    android:layout_height="wrap_content"
+                    android:layout_width="fill_parent" />
+                <TextView
+                    android:text="@string/account_setup_outgoing_password_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_password"
+                    android:inputType="textPassword"
+                    android:imeOptions="actionDone"
+                    android:layout_height="wrap_content"
+                    android:layout_width="fill_parent" />
+            </LinearLayout>
         </LinearLayout>
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1" />
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="54dip"