diff --git a/lib/Search/ConversationSearch.php b/lib/Search/ConversationSearch.php
index 6687adbfe04..d54f83b31d9 100644
--- a/lib/Search/ConversationSearch.php
+++ b/lib/Search/ConversationSearch.php
@@ -141,7 +141,7 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
 				$iconClass = 'conversation-icon icon-contacts';
 			}
 
-			$result[] = new SearchResultEntry(
+			$entry = new SearchResultEntry(
 				$icon,
 				$room->getDisplayName($user->getUID()),
 				'',
@@ -149,6 +149,10 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
 				$iconClass,
 				true
 			);
+
+			$entry->addAttribute('conversation', $room->getToken());
+
+			$result[] = $entry;
 		}
 
 		return SearchResult::complete(
diff --git a/lib/Search/MessageSearch.php b/lib/Search/MessageSearch.php
index 646e394fde6..cc96a038662 100644
--- a/lib/Search/MessageSearch.php
+++ b/lib/Search/MessageSearch.php
@@ -206,7 +206,7 @@ protected function commentToSearchResultEntry(Room $room, IUser $user, IComment
 			$subline = '{user}';
 		}
 
-		return new SearchResultEntry(
+		$entry = new SearchResultEntry(
 			$iconUrl,
 			str_replace(
 				['{user}', '{conversation}'],
@@ -218,5 +218,10 @@ protected function commentToSearchResultEntry(Room $room, IUser $user, IComment
 			'icon-talk', // $iconClass,
 			true
 		);
+
+		$entry->addAttribute('conversation', $room->getToken());
+		$entry->addAttribute('messageId', $comment->getId());
+
+		return $entry;
 	}
 }