diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index 886189c32..420626939 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -359,7 +359,6 @@
           See com.fsck.k9.activity.setup.AccountSettings
         -->
         <RingtonePreference
-            android:layout="?android:attr/preferenceLayoutChild"
             android:dependency="account_notify"
             android:key="account_ringtone"
             android:title="@string/account_settings_ringtone"
@@ -368,7 +367,6 @@
 
         <CheckBoxPreference
             android:persistent="false"
-            android:layout="?android:attr/preferenceLayoutChild"
             android:dependency="account_notify"
             android:key="account_vibrate"
             android:defaultValue="false"
@@ -377,6 +375,7 @@
 
         <ListPreference
             android:persistent="false"
+            android:layout="?android:attr/preferenceLayoutChild"
             android:dependency="account_vibrate"
             android:key="account_vibrate_pattern"
             android:title="@string/account_settings_vibrate_pattern_label"
@@ -386,6 +385,7 @@
 
         <ListPreference
             android:persistent="false"
+            android:layout="?android:attr/preferenceLayoutChild"
             android:dependency="account_vibrate"
             android:key="account_vibrate_times"
             android:title="@string/account_settings_vibrate_times"
diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml
index cb90924ea..a310b68f7 100644
--- a/res/xml/global_preferences.xml
+++ b/res/xml/global_preferences.xml
@@ -97,6 +97,18 @@
 
         </PreferenceCategory>
 
+        <PreferenceCategory
+            android:key="folderlist_preferences"
+            android:title="@string/folderlist_preferences">
+
+            <CheckBoxPreference
+                android:persistent="false"
+                android:key="folderlist_wrap_folder_name"
+                android:title="@string/global_settings_folderlist_wrap_folder_names_label"
+                android:summary="@string/global_settings_folderlist_wrap_folder_names_summary" />
+
+        </PreferenceCategory>
+
         <PreferenceCategory
             android:title="@string/messagelist_preferences"
             android:key="messagelist_preferences">
@@ -176,18 +188,6 @@
 
         </PreferenceCategory>
 
-        <PreferenceCategory
-            android:key="folderlist_preferences"
-            android:title="@string/folderlist_preferences">
-
-            <CheckBoxPreference
-                android:persistent="false"
-                android:key="folderlist_wrap_folder_name"
-                android:title="@string/global_settings_folderlist_wrap_folder_names_label"
-                android:summary="@string/global_settings_folderlist_wrap_folder_names_summary" />
-
-        </PreferenceCategory>
-
     </PreferenceScreen>
 
     <PreferenceScreen