diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 6214896bf3..70f2e958c3 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -543,6 +543,12 @@ public class ApplicationEx extends Application
             repairFolders(context);
         else if (version < 1772)
             editor.remove("conversation_actions");
+        else if (version < 1781) {
+            if (prefs.contains("ascending_list")) {
+                boolean ascending = prefs.getBoolean("ascending_list", false);
+                editor.putBoolean("ascending_unified", ascending);
+            }
+        }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG)
             editor.remove("background_service");
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 289a6ffe06..cabb219eba 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -6214,7 +6214,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
     }
 
     static String getSortOrder(Context context, AdapterMessage.ViewType viewType, String type) {
-        return (viewType == AdapterMessage.ViewType.THREAD ? "ascending_thread" : "ascending_list");
+        if (viewType == AdapterMessage.ViewType.THREAD)
+            return "ascending_thread";
+        else if (viewType == AdapterMessage.ViewType.UNIFIED)
+            return "ascending_unified";
+        else
+            return "ascending_list";
     }
 
     static String getFilter(Context context, String name, AdapterMessage.ViewType viewType, String type) {