Handle empty thread root id

Signed-off-by: Anna Larch <anna@nextcloud.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/Controller/MessagesController.php b/lib/Controller/MessagesController.php
index 0ec4bdea7..36945b46c 100755
--- a/lib/Controller/MessagesController.php
+++ b/lib/Controller/MessagesController.php
@@ -134,7 +134,6 @@ class MessagesController extends Controller {
 								ITrustedSenderService $trustedSenderService,
 								IMailTransmission $mailTransmission) {
 		parent::__construct($appName, $request);
-
 		$this->accountService = $accountService;
 		$this->mailManager = $mailManager;
 		$this->mailSearch = $mailSearch;
@@ -328,6 +327,10 @@ class MessagesController extends Controller {
 			return new JSONResponse([], Http::STATUS_FORBIDDEN);
 		}
 
+		if (empty($message->getThreadRootId())) {
+			return new JSONResponse([], Http::STATUS_NOT_FOUND);
+		}
+
 		return new JSONResponse($this->mailManager->getThread($account, $message->getThreadRootId()));
 	}