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 fc1499462..3fbec55da 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
@@ -901,10 +901,12 @@ class MailClient
 					$aUids = $this->GetUids($oParams->oCacher, '',
 						$oMessageCollection->FolderName, $oMessageCollection->FolderHash, $bUseSortIfSupported, $oParams->sSort);
 					// Remove all threaded UID's except the most recent of each thread
+					$threadedUids = [];
 					foreach ($aAllThreads as $aMap) {
 						unset($aMap[\array_key_last($aMap)]);
-						$aUids = \array_diff($aUids, $aMap);
+						$threadedUids = \array_merge($threadedUids, $aMap);
 					}
+					$aUids = \array_diff($aUids, $threadedUids);
 				}
 			} else {
 				$aUids = $this->GetUids($oParams->oCacher, '',
@@ -916,15 +918,14 @@ class MailClient
 				$aSearchedUids = $this->GetUids($oParams->oCacher, $sSearch,
 					$oMessageCollection->FolderName, $oMessageCollection->FolderHash);
 				if ($bUseThreads && !$oParams->iThreadUid) {
-					$aUids = \array_filter($aUids, function($iUid) use ($aSearchedUids, $aAllThreads) {
-						if (\in_array($iUid, $aSearchedUids)) {
-							return true;
-						}
-						foreach ($aAllThreads as $aMap) {
-							if (\in_array($iUid, $aMap) && \array_intersect($aSearchedUids, $aMap)) {
-								return true;
+					$matchingThreadUids = [];
+					foreach ($aAllThreads as $aMap) {
+							if (\array_intersect($aSearchedUids, $aMap)) {
+									$matchingThreadUids = \array_merge($matchingThreadUids, $aMap);
 							}
-						}
+					}
+					$aUids = \array_filter($aUids, function($iUid) use ($aSearchedUids, $matchingThreadUids) {
+						return \in_array($iUid, $aSearchedUids) || \in_array($iUid, $matchingThreadUids);
 					});
 				} else {
 					$aUids = \array_filter($aUids, function($iUid) use ($aSearchedUids) {