diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml
index 8c22d5723..949bccda6 100644
--- a/res/layout/account_setup_incoming.xml
+++ b/res/layout/account_setup_incoming.xml
@@ -16,45 +16,6 @@
         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:singleLine="true"
-            android:inputType="textEmailAddress"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:contentDescription="@string/account_setup_incoming_username_label" />
-        <TextView
-            android:id="@+id/account_password_label"
-            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:singleLine="true"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-        <TextView
-            android:id="@+id/account_client_certificate_label"
-            android:text="@string/account_setup_incoming_client_certificate_label"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorPrimary"
-            android:visibility="gone" />
-        <com.fsck.k9.view.ClientCertificateSpinner
-            android:id="@+id/account_client_certificate_spinner"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:visibility="gone" />
         <!-- This text may be changed in code if the server is IMAP, etc. -->
         <TextView
             android:id="@+id/account_server_label"
@@ -81,18 +42,6 @@
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
             android:contentDescription="@string/account_setup_incoming_security_label" />
-        <TextView
-            android:id="@+id/account_auth_type_label"
-            android:text="@string/account_setup_incoming_auth_type_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_auth_type"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:contentDescription="@string/account_setup_incoming_auth_type_label" />
         <TextView
             android:text="@string/account_setup_incoming_port_label"
             android:layout_height="wrap_content"
@@ -106,6 +55,57 @@
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
             android:contentDescription="@string/account_setup_incoming_port_label" />
+        <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:singleLine="true"
+            android:inputType="textEmailAddress"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:contentDescription="@string/account_setup_incoming_username_label" />
+        <TextView
+            android:id="@+id/account_auth_type_label"
+            android:text="@string/account_setup_incoming_auth_type_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_auth_type"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:contentDescription="@string/account_setup_incoming_auth_type_label" />
+        <TextView
+            android:id="@+id/account_password_label"
+            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:singleLine="true"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent" />
+        <TextView
+            android:id="@+id/account_client_certificate_label"
+            android:text="@string/account_setup_incoming_client_certificate_label"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorPrimary"
+            android:visibility="gone" />
+        <com.fsck.k9.view.ClientCertificateSpinner
+            android:id="@+id/account_client_certificate_spinner"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:visibility="gone" />
         <LinearLayout
             android:id="@+id/imap_path_prefix_section"
             android:layout_width="fill_parent"
diff --git a/res/layout/account_setup_outgoing.xml b/res/layout/account_setup_outgoing.xml
index 26da22984..4a1de164e 100644
--- a/res/layout/account_setup_outgoing.xml
+++ b/res/layout/account_setup_outgoing.xml
@@ -74,19 +74,6 @@
                 android:orientation="vertical"
                 android:visibility="gone">
 
-                <TextView
-                    android:text="@string/account_setup_outgoing_authentication_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_auth_type"
-                    android:layout_height="wrap_content"
-                    android:layout_width="fill_parent"
-                    android:contentDescription="@string/account_setup_outgoing_authentication_label" />
-
                 <TextView
                     android:text="@string/account_setup_outgoing_username_label"
                     android:layout_height="wrap_content"
@@ -102,6 +89,19 @@
                     android:layout_width="fill_parent"
                     android:contentDescription="@string/account_setup_outgoing_username_label" />
 
+                <TextView
+                    android:text="@string/account_setup_outgoing_authentication_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_auth_type"
+                    android:layout_height="wrap_content"
+                    android:layout_width="fill_parent"
+                    android:contentDescription="@string/account_setup_outgoing_authentication_label" />
+
                 <TextView
                     android:id="@+id/account_password_label"
                     android:text="@string/account_setup_outgoing_password_label"