From ae40214f462b686cf30d3648612a71b891d2e487 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 5 Dec 2022 19:24:29 +0100
Subject: [PATCH] Maybe solution for #746 and #748 ?

---
 snappymail/v/0.0.0/app/libraries/MailSo/Mail/Folder.php        | 2 +-
 snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php    | 2 +-
 snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Folder.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Folder.php
index ec1ab2fc8..db5066cb8 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Folder.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Folder.php
@@ -214,7 +214,7 @@ class Folder implements \JsonSerializable
 				'UidNext' => (int) $aStatus['UIDNEXT'],
 //				'Hash' => $this->MailClient()->GenerateFolderHash(
 //					$this->FullName(), $aStatus['MESSAGES'], $aStatus['UIDNEXT'],
-//						empty($aStatus['HIGHESTMODSEQ']) ? $aStatus['UIDVALIDITY'] : $aStatus['HIGHESTMODSEQ'])
+//						\max(0, $aStatus['HIGHESTMODSEQ'] ?? $aStatus['UIDVALIDITY'])
 			);
 		}
 */
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index 9d57e46d7..9e86a2c7d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -833,7 +833,7 @@ class MailClient
 		}
 
 		$oMessageCollection->FolderHash = $this->GenerateFolderHash(
-			$oParams->sFolderName, $oInfo->MESSAGES, $oInfo->UIDNEXT, $oInfo->HIGHESTMODSEQ ?: $oInfo->UIDVALIDITY
+			$oParams->sFolderName, $oInfo->MESSAGES, $oInfo->UIDNEXT, \max(0, $oInfo->HIGHESTMODSEQ ?: $oInfo->UIDVALIDITY)
 		);
 
 		if (!$oParams->iThreadUid) {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
index 455552db0..219ed9ddd 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
@@ -256,7 +256,7 @@ trait Response
 					$mResponse->FullName(),
 					$aStatus['MESSAGES'],
 					$aStatus['UIDNEXT'],
-					empty($aStatus['HIGHESTMODSEQ']) ? $aStatus['UIDVALIDITY'] : $aStatus['HIGHESTMODSEQ']
+					\max(0, $aStatus['HIGHESTMODSEQ'] ?? $aStatus['UIDVALIDITY'])
 				);
 			}