diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index 683827258..81b41c10e 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -18,6 +18,9 @@
   Make sure to add android:persistent="false" to all preferences to disable saving
   the preference values to SharedPreferences. We use our own storage mechanism for
   the preferences. See com.fsck.k9.preferences.Storage.
+
+  Also note that every sub-PreferenceScreen needs an "android:key" parameter so the correct screen
+  can be displayed after the device has been rotated.
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
@@ -43,7 +46,8 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:title="@string/account_settings_display_prefs_title">
+        android:title="@string/account_settings_display_prefs_title"
+        android:key="display">
 
         <PreferenceCategory
             android:title="@string/account_settings_message_lists"
@@ -82,7 +86,8 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:title="@string/interaction_preferences">
+        android:title="@string/interaction_preferences"
+        android:key="interaction">
 
         <CheckBoxPreference
             android:persistent="false"
@@ -341,7 +346,7 @@
     </PreferenceScreen>
     <PreferenceScreen
         android:title="@string/account_settings_storage_title"
-        android:key="folders">
+        android:key="storage_provider">
 
         <ListPreference
             android:persistent="false"
diff --git a/res/xml/folder_settings_preferences.xml b/res/xml/folder_settings_preferences.xml
index 7017c50c8..c01b58b0e 100644
--- a/res/xml/folder_settings_preferences.xml
+++ b/res/xml/folder_settings_preferences.xml
@@ -18,6 +18,9 @@
   Make sure to add android:persistent="false" to all preferences to disable saving
   the preference values to SharedPreferences. We use our own storage mechanism for
   the preferences. See com.fsck.k9.preferences.Storage.
+
+  Also note that every sub-PreferenceScreen needs an "android:key" parameter so the correct screen
+  can be displayed after the device has been rotated.
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/res/xml/font_preferences.xml b/res/xml/font_preferences.xml
index 52606d089..ce9edf607 100644
--- a/res/xml/font_preferences.xml
+++ b/res/xml/font_preferences.xml
@@ -4,6 +4,9 @@
   Make sure to add android:persistent="false" to all preferences to disable saving
   the preference values to SharedPreferences. We use our own storage mechanism for
   the preferences. See com.fsck.k9.preferences.Storage.
+
+  Also note that every sub-PreferenceScreen needs an "android:key" parameter so the correct screen
+  can be displayed after the device has been rotated.
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml
index 02fa3c9a7..2c7556f31 100644
--- a/res/xml/global_preferences.xml
+++ b/res/xml/global_preferences.xml
@@ -18,6 +18,9 @@
   Make sure to add android:persistent="false" to all preferences to disable saving
   the preference values to SharedPreferences. We use our own storage mechanism for
   the preferences. See com.fsck.k9.preferences.Storage.
+
+  Also note that every sub-PreferenceScreen needs an "android:key" parameter so the correct screen
+  can be displayed after the device has been rotated.
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
@@ -66,13 +69,13 @@
                 android:key="animations"
                 android:title="@string/animations_title"
                 android:summary="@string/animations_summary" />
-                
+
             <CheckBoxPreference
                 android:persistent="false"
                 android:key="compact_layouts"
                 android:title="@string/compact_layouts_title"
                 android:summary="@string/compact_layouts_summary" />
-                
+
 
         </PreferenceCategory>
 
@@ -157,7 +160,7 @@
                 android:dependency="messagelist_show_contact_name"
                 />
 
-				
+
         </PreferenceCategory>
 
         <PreferenceCategory
@@ -243,7 +246,7 @@
 			android:title="@string/global_settings_batch_buttons"
 			android:summary="@string/global_settings_batch_buttons_summary"
 			android:key="batch_buttons_settings">
-		
+
 			<CheckBoxPreference
 				android:persistent="false"
 				android:key="batch_buttons_mark_read"
@@ -272,37 +275,37 @@
 				android:persistent="false"
 				android:key="batch_buttons_flag"
 				android:title="@string/global_settings_flag"
-			/> 				
+			/>
 
 			<CheckBoxPreference
 				android:persistent="false"
 				android:key="batch_buttons_unselect"
 				android:title="@string/global_settings_unselect"
-			/> 				
+			/>
 
 		</PreferenceScreen>
 
     </PreferenceScreen>
 
-    <PreferenceScreen 
+    <PreferenceScreen
         android:title="@string/notifications_title"
         android:key="notification_preferences">
-        
-        <CheckBoxPreference 
+
+        <CheckBoxPreference
             android:key="quiet_time_enabled"
             android:persistent="false"
             android:title="@string/quiet_time"
             android:summary="@string/quiet_time_description"
             />
         <com.fsck.k9.preferences.TimePickerPreference
-            android:key="quiet_time_starts" 
+            android:key="quiet_time_starts"
             android:persistent="false"
             android:dependency="quiet_time_enabled"
             android:dialogTitle="@string/quiet_time_starts"
             android:title="@string/quiet_time_starts"
             />
         <com.fsck.k9.preferences.TimePickerPreference
-            android:key="quiet_time_ends" 
+            android:key="quiet_time_ends"
             android:dependency="quiet_time_enabled"
             android:persistent="false"
             android:dialogTitle="@string/quiet_time_ends"