diff --git a/dev/Common/UtilsUser.js b/dev/Common/UtilsUser.js
index 0c683aa25..d8c47794b 100644
--- a/dev/Common/UtilsUser.js
+++ b/dev/Common/UtilsUser.js
@@ -121,7 +121,7 @@ computedPaginatorHelper = (koCurrentPage, koPageCount) => {
 			next = 0,
 			limit = 2;
 
-		if (1 < pageCount || (0 < pageCount && pageCount < currentPage)) {
+		if (1 < pageCount) {
 			if (pageCount < currentPage) {
 				fAdd(pageCount);
 				prev = pageCount;
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 8d15663d6..d0ddda7d4 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
@@ -879,8 +879,8 @@ class MailClient
 			}
 		}
 
-		if (\count($aUids)) {
-			$oMessageCollection->totalEmails = \count($aUids);
+		$oMessageCollection->totalEmails = \count($aUids);
+		if ($oMessageCollection->totalEmails) {
 			$aUids = \array_slice($aUids, $oParams->iOffset, $oParams->iLimit);
 			$this->MessageListByRequestIndexOrUids($oMessageCollection, new SequenceSet($aUids), $aAllThreads, $aUnseenUIDs);
 		}