Separate sort / unified

app/src/main/java/eu/faircode/email/ApplicationEx.java

@@ -544,6 +544,10 @@ public class ApplicationEx extends Application
         else if (version < 1772)
             editor.remove("conversation_actions");
         else if (version < 1781) {
+            if (prefs.contains("sort")) {
+                String sort = prefs.getString("sort", "time");
+                editor.putString("sort_unified", sort);
+            }
             if (prefs.contains("ascending_list")) {
                 boolean ascending = prefs.getBoolean("ascending_list", false);
                 editor.putBoolean("ascending_unified", ascending);

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -6248,7 +6248,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
     }
 
     static String getSort(Context context, AdapterMessage.ViewType viewType, String type) {
-        return "sort";
+        if (viewType == AdapterMessage.ViewType.UNIFIED)
+            return "sort_unified";
+        else
+            return "sort";
     }
 
     static String getSortOrder(Context context, AdapterMessage.ViewType viewType, String type) {