diff --git a/lib/Search/Provider.php b/lib/Search/Provider.php
index 1db28c7475..a80e75a2cf 100644
--- a/lib/Search/Provider.php
+++ b/lib/Search/Provider.php
@@ -109,17 +109,16 @@ protected function searchByFilter(IUser $user, ISearchQuery $query, string $filt
 				} else {
 					$from = null;
 				}
-
+				$deeplink = $this->urlGenerator->linkToRouteAbsolute('mail.deep_link.open', [
+					'messageId' => $message->getMessageId(),
+				]);
 				return new SearchResultEntry(
 					is_null($from) ? '' : $this->urlGenerator->linkToRoute('mail.avatars.image', [
 						'email' => $from,
 					]),
 					$message->getSubject(),
 					$subline,
-					$this->urlGenerator->linkToRouteAbsolute('mail.page.thread', [
-						'mailboxId' => $message->getMailboxId(),
-						'id' => $message->getId(),
-					]), // TODO: deep URL
+					$deeplink,
 					'icon-mail',
 					!is_null($from)
 				);