diff --git a/res/layout/accounts.xml b/res/layout/accounts.xml
index 064c95674..7d9690407 100644
--- a/res/layout/accounts.xml
+++ b/res/layout/accounts.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_height="wrap_content" 
+    android:layout_width="fill_parent">
     <ListView
         android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         />
     <ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:scrollbarStyle="outsideInset">
+        android:layout_marginBottom="50dip" 
+        android:layout_height="wrap_content" 
+        android:layout_width="fill_parent">
         <LinearLayout
             android:id="@+id/empty"
             android:layout_width="fill_parent"
@@ -25,27 +23,27 @@
                 android:textSize="14sp"
                 android:text="@string/accounts_welcome"
                 android:textColor="?android:attr/textColorPrimary"
-                android:padding="8dip"
-                />
+                android:padding="8dip"/>
             <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:gravity="bottom|right"
-                >
-                <Button
-                    android:id="@+id/add_new_account"
-                    android:layout_width="wrap_content"
-                    android:minWidth="@dimen/button_minWidth"
-                    android:layout_height="wrap_content"
-                    android:text="@string/next_action"
-                    android:drawableRight="@drawable/button_indicator_next"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true" />
-            </RelativeLayout>
         </LinearLayout>
     </ScrollView>
-</FrameLayout>
+    <RelativeLayout 
+        android:layout_marginTop="-50dip" 
+        android:gravity="bottom" 
+        android:layout_height="wrap_content" 
+        android:layout_width="fill_parent">
+        <Button
+            android:id="@+id/add_new_account"
+            android:layout_width="wrap_content"
+            android:minWidth="@dimen/button_minWidth"
+            android:layout_height="wrap_content"
+            android:text="@string/next_action"
+            android:drawableRight="@drawable/button_indicator_next"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="false" 
+            />
+    </RelativeLayout>
+</LinearLayout>