From f2b87192236884f97194d036a48aa16fd0a8ef16 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Sat, 24 Dec 2022 23:21:43 +0100
Subject: [PATCH] Changes for #796

---
 dev/Stores/User/Settings.js                           | 2 +-
 dev/View/User/MailBox/MessageList.js                  | 3 ++-
 snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js
index fc9899559..3c811e810 100644
--- a/dev/Stores/User/Settings.js
+++ b/dev/Stores/User/Settings.js
@@ -21,7 +21,7 @@ export const SettingsUserStore = new class {
 			listInlineAttachments: 0,
 			simpleAttachmentsList: 0,
 			useCheckboxesInList: 1,
-			listPerDay: 1,
+			listPerDay: 0,
 			allowDraftAutosave: 1,
 			useThreads: 0,
 			replySameFolder: 0,
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 8bcd16d87..4af191b31 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -94,7 +94,6 @@ export class MailMessageList extends AbstractViewRight {
 		this.popupVisibility = arePopupsVisible;
 
 		this.useCheckboxesInList = SettingsUserStore.useCheckboxesInList;
-		this.listPerDay = SettingsUserStore.listPerDay;
 
 		this.userUsageProc = FolderUserStore.quotaPercentage;
 
@@ -147,6 +146,8 @@ export class MailMessageList extends AbstractViewRight {
 
 			mobileCheckedStateHide: () => ThemeStore.isMobile() ? !MessagelistUserStore.hasChecked() : 1,
 
+			listPerDay: () => SettingsUserStore.listPerDay() && 'DATE' == (FolderUserStore.sortMode() || 'DATE'),
+
 			listByDay: () => {
 				let list = [], current, today = Ymd(new Date()),
 					rtf = Intl.RelativeTimeFormat
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index 5142c24f2..2d810b16e 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -693,7 +693,7 @@ class Actions
 					'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false),
 					'ListInlineAttachments' => false,
 					'simpleAttachmentsList' => false,
-					'listPerDay' => true,
+					'listPerDay' => false,
 					'MessagesPerPage' => (int) $oConfig->Get('webmail', 'messages_per_page', 25),
 					'MessageReadDelay' => (int) $oConfig->Get('webmail', 'message_read_delay', 5),
 					'MsgDefaultAction' => 1,