diff --git a/res/layout/account_dialog_password.xml b/res/layout/account_dialog_password.xml
index 863b6b840..b1bcfd804 100644
--- a/res/layout/account_dialog_password.xml
+++ b/res/layout/account_dialog_password.xml
@@ -1,46 +1,54 @@
 <?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:orientation="vertical"
-    android:padding="10dp">
+    android:padding="10dp" >
 
-    <TextView android:id="@+id/account_dialog_password_help"
+    <TextView
+        android:id="@+id/account_dialog_password_help"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"/>
+        android:layout_marginBottom="10dp" />
+
     <EditText
         android:id="@+id/account_dialog_password_field"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
         android:inputType="textPassword"
-        android:password="true"
-        android:singleLine="true"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
         android:nextFocusDown="@+id/next"
-        />
+        android:password="true"
+        android:singleLine="true" />
 
-    <CheckBox android:id="@+id/account_dialog_manual_box"
-        android:layout_height="wrap_content"
+    <CheckBox
+        android:id="@+id/account_dialog_manual_box"
         android:layout_width="fill_parent"
-        android:text="@string/account_setup_basics_manual_setup_action"/>
-
-	<CheckBox android:id="@+id/account_dialog_default_box"
         android:layout_height="wrap_content"
+        android:text="@string/account_setup_basics_manual_setup_action" />
+
+    <!--<CheckBox
+        android:id="@+id/account_dialog_default_box"
         android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:lines="1"
-        android:text="@string/account_settings_default"/>
+        android:text="@string/account_settings_default" />-->
 
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp">
-        <Button android:id="@+id/account_dialog_next"
-            android:text="@string/next_action"
-            android:layout_height="wrap_content"
+        android:layout_marginTop="10dp" >
+
+        <Button
+            android:id="@+id/account_dialog_next"
             android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:drawableRight="@drawable/button_indicator_next"  />
+            android:layout_centerVertical="false"
+            android:layout_marginBottom="-4dip"
+            android:drawableRight="@drawable/button_indicator_next"
+            android:minWidth="@dimen/button_minWidth"
+            android:text="@string/next_action" />
     </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupIndex.java b/src/com/fsck/k9/activity/setup/AccountSetupIndex.java
index ae876a9bc..5e4c84163 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupIndex.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupIndex.java
@@ -178,13 +178,13 @@ public class AccountSetupIndex extends K9ListActivity implements OnItemClickList
 
                 final EditText passwordField = ((EditText) dialog.findViewById(R.id.account_dialog_password_field));
                 final CheckBox manualCheck = (CheckBox)dialog.findViewById(R.id.account_dialog_manual_box);
-                final CheckBox defaultCheck = (CheckBox)dialog.findViewById(R.id.account_dialog_default_box);
+                //final CheckBox defaultCheck = (CheckBox)dialog.findViewById(R.id.account_dialog_default_box);
 
                 mPasswordDialogButton.setOnClickListener(new OnClickListener() {
                     public void onClick(View view) {
                         String email = args.get(BUNDLE_TYPE_SUGGESTION).toString();
                         String password = passwordField.getText().toString();
-                        bMakeDefault = defaultCheck.isChecked();
+                        //bMakeDefault = defaultCheck.isChecked();
 
                         // TODO: replace this with a few listeners on the fields that activate/deactive the button on acceptable values
                         if( password.isEmpty() ) return;