From 8c077a94c642d9baff0aa1df55cab53eab7fa68a Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 20 Mar 2024 00:45:11 +0100
Subject: [PATCH] same small fixes

---
 dev/Mime/Utils.js                                           | 3 +--
 plugins/README.md                                           | 3 ++-
 snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev/Mime/Utils.js b/dev/Mime/Utils.js
index 014660cf3..4927898f3 100644
--- a/dev/Mime/Utils.js
+++ b/dev/Mime/Utils.js
@@ -18,6 +18,7 @@ export function MimeToMessage(data, message)
 			subject = struct.headerValue('subject');
 		html = html ? html.body : '';
 
+		// Content-Type: ...; protected-headers="v1"
 		subject && message.subject(subject);
 
 		// EmailCollectionModel
@@ -99,6 +100,4 @@ export function MimeToMessage(data, message)
 	if (message.plain().includes(BEGIN_PGP_MESSAGE)) {
 		message.pgpSigned(true);
 	}
-
-	// TODO: Verify instantly?
 }
diff --git a/plugins/README.md b/plugins/README.md
index b9b38cf59..ca7ba401d 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -454,7 +454,8 @@ and called in JavaScript using rl.pluginRemoteRequest().
 
 ### rl-view-model.create
 	event.detail = the ViewModel class
-	Happens immediately after the ViewModel constructor
+	Happens immediately after the ViewModel constructor.
+	See accessible properties as https://github.com/the-djmaze/snappymail/blob/master/dev/Knoin/AbstractViews.js
 
 ### rl-view-model
 	event.detail = the ViewModel class
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 399b34967..609296c4b 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
@@ -389,9 +389,11 @@ class MailClient
 		return '';
 	}
 
-	public function MessageThread(string $sMessageID) : MessageCollection
+	public function MessageThread(string $sFolderName, string $sMessageID) : MessageCollection
 	{
-		$sMessageID = SearchCriterias::escapeSearchString($this->oImapClient, $sMessageID);
+		$this->oImapClient->FolderExamine($sFolderName);
+
+		$sMessageID = \MailSo\Imap\SearchCriterias::escapeSearchString($this->oImapClient, $sMessageID);
 		$sSearch = "OR HEADER Message-ID {$sMessageID} HEADER References {$sMessageID}";
 		$aResult = [];
 		try