From 3a589e240cdb33ebc4e14632d5d73e23505c485f Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 23 Oct 2024 00:39:01 +0200
Subject: [PATCH] Proper fix for default sortMode

---
 dev/Stores/User/Folder.js            | 3 +--
 dev/Stores/User/Settings.js          | 3 +++
 dev/View/User/MailBox/MessageList.js | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js
index 12983b373..37007c768 100644
--- a/dev/Stores/User/Folder.js
+++ b/dev/Stores/User/Folder.js
@@ -7,7 +7,6 @@ import { forEachObjectEntry } from 'Common/Utils';
 import { getFolderInboxName, getFolderFromCacheList } from 'Common/Cache';
 import { Settings, SettingsCapa } from 'Common/Globals';
 //import Remote from 'Remote/User/Fetch'; // Circular dependency
-import { SettingsUserStore } from 'Stores/User/Settings';
 
 export const
 
@@ -60,7 +59,7 @@ FolderUserStore = new class {
 			 */
 			displaySpecSetting: false,
 
-			sortMode: SettingsUserStore.defaultSort(),
+			sortMode: '',
 
 			quotaLimit: 0,
 			quotaUsage: 0,
diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js
index 211a89288..26583c824 100644
--- a/dev/Stores/User/Settings.js
+++ b/dev/Stores/User/Settings.js
@@ -5,6 +5,7 @@ import { LayoutSideView, LayoutBottomView } from 'Common/EnumsUser';
 import { pInt } from 'Common/Utils';
 import { $htmlCL, SettingsGet, fireEvent } from 'Common/Globals';
 import { ThemeStore } from 'Stores/Theme';
+import { FolderUserStore } from 'Stores/User/Folder';
 
 export const SettingsUserStore = new class {
 	constructor() {
@@ -163,5 +164,7 @@ export const SettingsUserStore = new class {
 		self.messageReadDelay(pInt(SettingsGet('MessageReadDelay')));
 		self.autoLogout(pInt(SettingsGet('AutoLogout')));
 		self.keyPassForget(pInt(SettingsGet('keyPassForget')));
+
+		FolderUserStore.sortMode(self.defaultSort());
 	}
 };
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index e767d7dca..2517fe903 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -212,7 +212,7 @@ export class MailMessageList extends AbstractViewRight {
 			},
 
 			sortText: () => {
-				let mode = FolderUserStore.sortMode() || '',
+				let mode = FolderUserStore.sortMode(),
 					has = w => mode.includes(w),
 					desc = '' === mode || has('REVERSE');
 				mode = mode.split(/\s+/);