diff --git a/dev/App/User.js b/dev/App/User.js
index ba1514a39..27ad32cba 100644
--- a/dev/App/User.js
+++ b/dev/App/User.js
@@ -90,6 +90,7 @@ export class AppUser extends AbstractApp {
 		addEventListener('click', dropdownsDetectVisibility);
 
 		this.folderList = FolderUserStore.folderList;
+		this.messageList = MessagelistUserStore;
 	}
 
 	/**
diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index 32241386e..a878505b5 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -127,7 +127,7 @@ export class MessageModel extends AbstractModel {
 		addComputablesTo(this, {
 			attachmentIconClass: () =>
 				this.encrypted() ? 'icon-lock' : FileInfo.getAttachmentsIconClass(this.attachments()),
-			threadsLen: () => this.threads().length,
+			threadsLen: () => rl.app.messageList.threadUid() ? 0 : this.threads().length,
 
 			isUnseen: () => !this.flags().includes('\\seen'),
 			isFlagged: () => this.flags().includes('\\flagged'),
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 07a43c323..92b9f13fc 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
@@ -707,7 +707,7 @@ class MailClient
 								break;
 							}
 						}
-						$aAllThreads = [];
+						$aAllThreads = [$aUids];
 						// This only speeds up the search when not cached
 //						$oParams->oSequenceSet = new SequenceSet($aUids);
 					} else {