diff --git a/dev/Model/MessageCollection.js b/dev/Model/MessageCollection.js
index e7830516a..4e5ebc1a8 100644
--- a/dev/Model/MessageCollection.js
+++ b/dev/Model/MessageCollection.js
@@ -18,7 +18,6 @@ export class MessageCollectionModel extends AbstractCollectionModel
 		this.FolderInfo
 		this.totalEmails
 		this.unreadEmails
-		this.MessageResultCount
 		this.UidNext
 		this.ThreadUid
 		this.NewMessages
diff --git a/dev/Stores/User/Messagelist.js b/dev/Stores/User/Messagelist.js
index 3608829aa..8b2b58ce1 100644
--- a/dev/Stores/User/Messagelist.js
+++ b/dev/Stores/User/Messagelist.js
@@ -258,7 +258,7 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
 						MessagelistUserStore.notifyNewMessages(folder.fullName, collection.NewMessages);
 					}
 
-					MessagelistUserStore.count(collection.MessageResultCount);
+					MessagelistUserStore.count(collection.totalEmails);
 					MessagelistUserStore.listSearch(pString(collection.Search));
 					MessagelistUserStore.page(Math.ceil(collection.Offset / SettingsUserStore.messagesPerPage() + 1));
 					MessagelistUserStore.threadUid(collection.ThreadUid);
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 a0917d0b2..948ae6fe8 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
@@ -802,15 +802,15 @@ class MailClient
 					$aUids = $this->GetUids($oParams, $sSearch,
 						$oMessageCollection->FolderName, $oMessageCollection->FolderHash);
 
-					$oMessageCollection->MessageResultCount = \count($aUids);
-					if ($oMessageCollection->MessageResultCount) {
+					$oMessageCollection->totalEmails = \count($aUids);
+					if ($oMessageCollection->totalEmails) {
 						$this->MessageListByRequestIndexOrUids(
 							$oMessageCollection,
 							new SequenceSet(\array_slice($aUids, $oParams->iOffset, $oParams->iLimit))
 						);
 					}
 				} else {
-					$oMessageCollection->MessageResultCount = $oInfo->MESSAGES;
+					$oMessageCollection->totalEmails = $oInfo->MESSAGES;
 					if (1 < $oInfo->MESSAGES) {
 						$end = \max(1, $oInfo->MESSAGES - $oParams->iOffset);
 						$start = \max(1, $end - $oParams->iLimit + 1);
@@ -825,6 +825,7 @@ class MailClient
 				$bUseSortIfSupported = $oParams->bUseSortIfSupported && $this->oImapClient->IsSupported('SORT');
 				if ($bUseThreads) {
 					$aAllThreads = $this->MessageListThreadsMap($oMessageCollection->FolderName, $oMessageCollection->FolderHash, $oParams->oCacher);
+					$oMessageCollection->totalThreads = \count($aAllThreads);
 //					$iThreadLimit = $this->oImapClient->Settings->thread_limit;
 					if ($oParams->iThreadUid) {
 						$aUids = [$oParams->iThreadUid];
@@ -871,7 +872,7 @@ class MailClient
 					}
 				}
 
-				$oMessageCollection->MessageResultCount = \count($aUids);
+				$oMessageCollection->totalEmails = \count($aUids);
 
 				if (\count($aUids)) {
 					$this->MessageListByRequestIndexOrUids(
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php
index acdafa071..b974653c0 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php
@@ -22,7 +22,9 @@ class MessageCollection extends \MailSo\Base\Collection
 	/**
 	 * Amount of UIDs in this list (could be less then total messages when using threads)
 	 */
-	public int $MessageResultCount = 0;
+	public int $totalEmails = 0;
+
+	public ?int $totalThreads = null;
 
 	public string $FolderName = '';
 
@@ -56,7 +58,8 @@ class MessageCollection extends \MailSo\Base\Collection
 	public function jsonSerialize()
 	{
 		return array_merge(parent::jsonSerialize(), array(
-			'MessageResultCount' => $this->MessageResultCount,
+			'totalEmails' => $this->totalEmails,
+			'totalThreads' => $this->totalThreads,
 			'Folder' => $this->FolderName,
 			'FolderHash' => $this->FolderHash,
 			'FolderInfo' => $this->FolderInfo,