diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml
index 77cd67e7f..a03df586a 100644
--- a/res/layout/account_setup_incoming.xml
+++ b/res/layout/account_setup_incoming.xml
@@ -170,7 +170,7 @@
 </ScrollView>
     <RelativeLayout 
         android:layout_marginTop="-54dip" 
-        android:gravity="bottom" 
+        android:gravity="bottom|right" 
         android:layout_height="wrap_content" 
         android:layout_width="fill_parent">
 		<Button
diff --git a/res/layout/account_setup_names.xml b/res/layout/account_setup_names.xml
index ef12e7032..81f1d391a 100644
--- a/res/layout/account_setup_names.xml
+++ b/res/layout/account_setup_names.xml
@@ -39,6 +39,7 @@
         android:layout_weight="1" />
     <RelativeLayout
         android:layout_width="fill_parent"
+        android:gravity="bottom|right" 
         android:layout_height="54dip"
         >
         <Button
diff --git a/res/layout/account_setup_outgoing.xml b/res/layout/account_setup_outgoing.xml
index 403e82433..cad9a92b2 100644
--- a/res/layout/account_setup_outgoing.xml
+++ b/res/layout/account_setup_outgoing.xml
@@ -90,7 +90,7 @@
 	</ScrollView>
     <RelativeLayout 
         android:layout_marginTop="-54dip" 
-        android:gravity="bottom" 
+        android:gravity="bottom|right" 
         android:layout_height="wrap_content" 
         android:layout_width="fill_parent">
 		<Button
diff --git a/res/layout/accounts.xml b/res/layout/accounts.xml
index ea9f0e017..dadf8d046 100644
--- a/res/layout/accounts.xml
+++ b/res/layout/accounts.xml
@@ -14,7 +14,7 @@
 			android:layout_height="wrap_content" 
 			android:layout_width="fill_parent">
     <ScrollView
-        android:layout_marginBottom="50dip" 
+        android:layout_marginBottom="54dip" 
         android:layout_height="wrap_content" 
         android:layout_width="fill_parent">
         <LinearLayout