diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
index 1953ceb4864..0eb55fca686 100644
--- a/src/components/LeftSidebar/LeftSidebar.vue
+++ b/src/components/LeftSidebar/LeftSidebar.vue
@@ -230,6 +230,22 @@
 							:text="FILTER_LABELS[filter]"
 							@close="handleFilter(filter)" />
 					</TransitionWrapper>
+					<!-- Search scopes -->
+					<div v-if="isSearching" class="conversations__search-filters">
+						<NcChip
+							v-for="filter in SEARCH_FILTERS"
+							:key="filter"
+							noClose
+							class="search-filter-chip"
+							:variant="searchFilters.includes(filter) ? 'primary' : 'secondary'"
+							:text="SEARCH_FILTER_LABELS[filter]"
+							role="button"
+							tabindex="0"
+							:aria-pressed="searchFilters.includes(filter)"
+							@click="handleSearchFilter(filter)"
+							@keydown.enter.prevent="handleSearchFilter(filter)"
+							@keydown.space.prevent="handleSearchFilter(filter)" />
+					</div>
 				</div>
 
 				<div v-if="!isSearching" class="navigation-buttons-container">
@@ -356,10 +372,15 @@
 				class="scroller"
 				:searchText="searchText"
 				:searchResultsLoading="searchResultsLoading"
+				:searchFilters="searchFilters"
 				:conversationsList="conversationsList"
 				:searchResults="searchResults"
+				:searchResultsMessages="searchResultsMessages"
 				:searchResultsListedConversations="searchResultsListedConversations"
+				:hasMoreMessages="hasMoreMessages"
+				:messagesLoadingMore="messagesLoadingMore"
 				@abortSearch="abortSearch"
+				@loadMoreMessages="fetchMoreMessages"
 				@createNewConversation="createConversation"
 				@createAndJoinConversation="createAndJoinConversation" />
 		</template>
@@ -458,7 +479,10 @@ import {
 	fetchNoteToSelfConversation,
 	searchListedConversations,
 } from '../../services/conversationsService.ts'
-import { autocompleteQuery } from '../../services/coreService.ts'
+import {
+	autocompleteQuery,
+	searchMessagesEverywhere,
+} from '../../services/coreService.ts'
 import { EventBus } from '../../services/EventBus.ts'
 import { talkBroadcastChannel } from '../../services/talkBroadcastChannel.js'
 import { useActorStore } from '../../stores/actor.ts'
@@ -498,6 +522,17 @@ const FILTER_LABELS = {
 	events: t('spreed', 'Meetings'),
 	default: '',
 }
+// Scopes to include in the search results. Message search is opt-in, as a
+// global message search triggers an additional request on every search.
+const SEARCH_FILTERS = ['conversations', 'people', 'messages']
+const SEARCH_FILTER_LABELS = {
+	conversations: t('spreed', 'Conversations'),
+	people: t('spreed', 'People'),
+	messages: t('spreed', 'Messages'),
+}
+const SEARCH_FILTERS_DEFAULT = ['conversations', 'people']
+// Number of message results to fetch per page in the global message search
+const MESSAGE_SEARCH_LIMIT = 5
 const SORT_LABELS = {
 	// TRANSLATORS Navigation actions: sort conversations by recent activity / sort alphabetically
 	SORTBY_HEADER: t('spreed', 'Sort conversations'),
@@ -572,6 +607,7 @@ export default {
 		const showArchived = ref(false)
 		const showThreadsList = ref(false)
 		const filters = ref(BrowserStorage.getItem('filterEnabled')?.split(',') ?? [])
+		const searchFilters = ref([...SEARCH_FILTERS_DEFAULT])
 
 		const federationStore = useFederationStore()
 		const talkHashStore = useTalkHashStore()
@@ -588,6 +624,7 @@ export default {
 			resetNavigation,
 			leftSidebar,
 			filters,
+			searchFilters,
 			searchBox,
 			scroller,
 			federationStore,
@@ -606,6 +643,8 @@ export default {
 			CONVERSATION,
 			HOME_BUTTON_LABEL,
 			FILTER_LABELS,
+			SEARCH_FILTERS,
+			SEARCH_FILTER_LABELS,
 			SORT_LABELS,
 			LIST_HEADING_ID,
 			actorStore: useActorStore(),
@@ -620,10 +659,15 @@ export default {
 			searchText: '',
 			searchResults: [],
 			searchResultsListedConversations: [],
+			searchResultsMessages: [],
 			searchResultsLoading: true,
+			searchMessagesCursor: null,
+			hasMoreMessages: false,
+			messagesLoadingMore: false,
 			canStartConversations: getTalkConfig('local', 'conversations', 'can-create'),
 			cancelSearchPossibleConversations: () => {},
 			cancelSearchListedConversations: () => {},
+			cancelSearchMessages: () => {},
 			debounceFetchSearchResults: () => {},
 			debounceFetchConversations: () => {},
 			debounceHandleScroll: () => {},
@@ -862,6 +906,9 @@ export default {
 		this.cancelSearchListedConversations()
 		this.cancelSearchListedConversations = null
 
+		this.cancelSearchMessages()
+		this.cancelSearchMessages = null
+
 		if (this.refreshTimer) {
 			clearInterval(this.refreshTimer)
 			this.refreshTimer = null
@@ -982,6 +1029,85 @@ export default {
 			}
 		},
 
+		/**
+		 * Map a raw unified search entry to a result with a router link
+		 *
+		 * @param {object} entry The unified search result entry
+		 * @return {object} The entry extended with a `to` router link
+		 */
+		mapMessageResultEntry(entry) {
+			const threadId = (entry.attributes.threadId !== entry.attributes.messageId) ? entry.attributes.threadId : undefined
+
+			return {
+				...entry,
+				to: {
+					name: 'conversation',
+					hash: `#message_${entry.attributes.messageId}`,
+					params: { token: entry.attributes.conversation },
+					query: { threadId },
+				},
+			}
+		},
+
+		async fetchMessagesEverywhere() {
+			// Reset pagination for a fresh search
+			this.searchMessagesCursor = null
+			this.hasMoreMessages = false
+
+			try {
+				this.cancelSearchMessages('canceled')
+				const { request, cancel } = CancelableRequest(searchMessagesEverywhere)
+				this.cancelSearchMessages = cancel
+
+				const response = await request({
+					term: this.searchText,
+					limit: MESSAGE_SEARCH_LIMIT,
+				})
+				const data = response?.data?.ocs?.data
+				this.searchResultsMessages = (data?.entries ?? []).map((entry) => this.mapMessageResultEntry(entry))
+				this.searchMessagesCursor = data?.cursor ?? null
+				this.hasMoreMessages = Boolean(data?.isPaginated) && data?.cursor !== null
+			} catch (exception) {
+				if (CancelableRequest.isCancel(exception)) {
+					return
+				}
+				console.error('Error searching for messages', exception)
+				showError(t('spreed', 'An error occurred while performing the search'))
+			}
+		},
+
+		async fetchMoreMessages() {
+			if (!this.hasMoreMessages || this.messagesLoadingMore) {
+				return
+			}
+
+			this.messagesLoadingMore = true
+			try {
+				this.cancelSearchMessages('canceled')
+				const { request, cancel } = CancelableRequest(searchMessagesEverywhere)
+				this.cancelSearchMessages = cancel
+
+				const response = await request({
+					term: this.searchText,
+					limit: MESSAGE_SEARCH_LIMIT,
+					cursor: this.searchMessagesCursor,
+				})
+				const data = response?.data?.ocs?.data
+				const entries = (data?.entries ?? []).map((entry) => this.mapMessageResultEntry(entry))
+				this.searchResultsMessages = [...this.searchResultsMessages, ...entries]
+				this.searchMessagesCursor = data?.cursor ?? null
+				this.hasMoreMessages = Boolean(data?.isPaginated) && data?.cursor !== null && entries.length > 0
+			} catch (exception) {
+				if (CancelableRequest.isCancel(exception)) {
+					return
+				}
+				console.error('Error searching for more messages', exception)
+				showError(t('spreed', 'An error occurred while performing the search'))
+			} finally {
+				this.messagesLoadingMore = false
+			}
+		},
+
 		async fetchSearchResults() {
 			if (!this.isSearching) {
 				return
@@ -993,11 +1119,78 @@ export default {
 
 			this.resetNavigation()
 			this.searchResultsLoading = true
-			await Promise.all([this.fetchPossibleConversations(), this.fetchListedConversations()])
+
+			// Only search the scopes enabled via the filter chips. Message search
+			// is opt-in, as it triggers an additional request on every search.
+			const requests = []
+			if (this.searchFilters.includes('people')) {
+				requests.push(this.fetchPossibleConversations())
+			} else {
+				this.searchResults = []
+			}
+			if (this.searchFilters.includes('conversations')) {
+				requests.push(this.fetchListedConversations())
+			} else {
+				this.searchResultsListedConversations = []
+			}
+			if (this.searchFilters.includes('messages')) {
+				requests.push(this.fetchMessagesEverywhere())
+			} else {
+				this.searchResultsMessages = []
+			}
+			await Promise.all(requests)
+
 			this.searchResultsLoading = false
 			this.initializeNavigation()
 		},
 
+		handleSearchFilter(filter) {
+			if (this.searchFilters.includes(filter)) {
+				this.searchFilters = this.searchFilters.filter((f) => f !== filter)
+				this.clearSearchFilterResults(filter)
+			} else {
+				this.searchFilters = [...this.searchFilters, filter]
+				if (this.isSearching) {
+					this.fetchSearchFilterResults(filter)
+				}
+			}
+		},
+
+		async fetchSearchFilterResults(filter) {
+			this.resetNavigation()
+			switch (filter) {
+				case 'people':
+					await this.fetchPossibleConversations()
+					break
+				case 'conversations':
+					await this.fetchListedConversations()
+					break
+				case 'messages':
+					await this.fetchMessagesEverywhere()
+					break
+			}
+			this.initializeNavigation()
+		},
+
+		clearSearchFilterResults(filter) {
+			switch (filter) {
+				case 'people':
+					this.cancelSearchPossibleConversations('canceled')
+					this.searchResults = []
+					break
+				case 'conversations':
+					this.cancelSearchListedConversations('canceled')
+					this.searchResultsListedConversations = []
+					break
+				case 'messages':
+					this.cancelSearchMessages('canceled')
+					this.searchResultsMessages = []
+					this.searchMessagesCursor = null
+					this.hasMoreMessages = false
+					break
+			}
+		},
+
 		/**
 		 * Create a new conversation with the selected user
 		 * or bring up the dialog to create a new group/circle conversation
@@ -1060,6 +1253,12 @@ export default {
 			if (this.cancelSearchListedConversations) {
 				this.cancelSearchListedConversations()
 			}
+			if (this.cancelSearchMessages) {
+				this.cancelSearchMessages()
+			}
+			this.searchMessagesCursor = null
+			this.hasMoreMessages = false
+			this.messagesLoadingMore = false
 		},
 
 		showSettings() {
@@ -1334,6 +1533,17 @@ export default {
 	gap: var(--default-grid-baseline);
 }
 
+.conversations__search-filters {
+	display: flex;
+	flex-wrap: wrap;
+	gap: var(--default-grid-baseline);
+	margin-block-start: var(--default-grid-baseline);
+
+	.search-filter-chip {
+		cursor: pointer;
+	}
+}
+
 .archived-conversations-bubble {
 	margin-inline: var(--default-grid-baseline);
 	color: var(--color-primary-element);
diff --git a/src/components/LeftSidebar/SearchConversationsResults/SearchConversationsResults.vue b/src/components/LeftSidebar/SearchConversationsResults/SearchConversationsResults.vue
index 9162cd1244a..e67e8d0bbbc 100644
--- a/src/components/LeftSidebar/SearchConversationsResults/SearchConversationsResults.vue
+++ b/src/components/LeftSidebar/SearchConversationsResults/SearchConversationsResults.vue
@@ -4,16 +4,23 @@
 -->
 
 <script setup lang="ts">
-import type { Conversation, ParticipantSearchResult } from '../../../types/index.ts'
+import type {
+	Conversation,
+	ParticipantSearchResult,
+	UnifiedSearchResultEntryWithRouterLink,
+} from '../../../types/index.ts'
 
 import { t } from '@nextcloud/l10n'
 import { useVirtualList } from '@vueuse/core'
 import { computed } from 'vue'
 import NcAppNavigationCaption from '@nextcloud/vue/components/NcAppNavigationCaption'
+import NcButton from '@nextcloud/vue/components/NcButton'
 import NcListItem from '@nextcloud/vue/components/NcListItem'
+import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
 import IconChatPlusOutline from 'vue-material-design-icons/ChatPlusOutline.vue'
 import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
 import ConversationIcon from '../../ConversationIcon.vue'
+import SearchMessageItem from '../../RightSidebar/SearchMessages/SearchMessageItem.vue'
 import NavigationHint from '../../UIShared/NavigationHint.vue'
 import ConversationItem from '../ConversationsList/ConversationItem.vue'
 import { ATTENDEE, AVATAR, CONVERSATION } from '../../../constants.ts'
@@ -26,12 +33,17 @@ const props = defineProps<{
 	searchText: string
 	conversationsList: Conversation[]
 	searchResultsLoading: boolean
+	searchFilters: string[]
 	searchResultsListedConversations: Conversation[]
 	searchResults: ParticipantSearchResult[]
+	searchResultsMessages: UnifiedSearchResultEntryWithRouterLink[]
+	hasMoreMessages: boolean
+	messagesLoadingMore: boolean
 }>()
 
 const emit = defineEmits<{
 	abortSearch: []
+	loadMoreMessages: []
 	createNewConversation: [searchText: string]
 	createAndJoinConversation: [item: Conversation | ParticipantSearchResult]
 }>()
@@ -76,6 +88,8 @@ type VirtualListItem
 		| { type: 'hint', id: string, hint: string }
 		| { type: 'conversation', id: number, object: Conversation }
 		| { type: 'open_conversation', id: number, object: Conversation }
+		| { type: 'message', id: number, object: UnifiedSearchResultEntryWithRouterLink }
+		| { type: 'load_more_messages', id: string }
 		| { type: 'action', id: string, name: string, subname: string }
 		| { type: 'user' | 'group' | 'circle' | 'federated', id: string, object: ParticipantSearchResult, icon: Record<string, unknown> }
 
@@ -93,73 +107,100 @@ const searchResultsVirtual = computed<VirtualListItem[]>(() => {
 		return searchTerms.every((term) => displayName.includes(term) || name.includes(term))
 	})
 
+	const showConversations = props.searchFilters.includes('conversations')
+	const showPeople = props.searchFilters.includes('people')
+	const showMessages = props.searchFilters.includes('messages')
+
 	// Add conversations section
-	virtualList.push({ type: 'caption', id: 'conversations_caption', name: t('spreed', 'Conversations') })
-	if (searchResultsConversationList.length === 0) {
-		virtualList.push({ type: 'hint', id: 'hint_conversations', hint: t('spreed', 'No matches found') })
-	} else {
-		sortConversationsList(searchResultsConversationList, settingsStore.groupMode, settingsStore.sortOrder)
-			.forEach((item: Conversation) => {
-				virtualList.push({ type: 'conversation', id: item.id, object: item })
-			})
+	if (showConversations) {
+		virtualList.push({ type: 'caption', id: 'conversations_caption', name: t('spreed', 'Conversations') })
+		if (searchResultsConversationList.length === 0) {
+			virtualList.push({ type: 'hint', id: 'hint_conversations', hint: t('spreed', 'No matches found') })
+		} else {
+			sortConversationsList(searchResultsConversationList, settingsStore.groupMode, settingsStore.sortOrder)
+				.forEach((item: Conversation) => {
+					virtualList.push({ type: 'conversation', id: item.id, object: item })
+				})
+		}
 	}
 
 	// Add "New Conversation" option if allowed
-	if (canStartConversations) {
+	if (canStartConversations && showPeople) {
 		virtualList.push({ type: 'action', id: 'new_conversation', name: props.searchText, subname: t('spreed', 'New private conversation') })
 	}
 
 	// Add 'Loading' message if there are no results received from the server yet
-	if (props.searchResultsLoading && !props.searchResultsListedConversations.length && !props.searchResults.length) {
+	if ((showConversations || showPeople) && props.searchResultsLoading && !props.searchResultsListedConversations.length && !props.searchResults.length) {
 		virtualList.push({ type: 'caption', id: 'loading_results_caption', name: t('spreed', 'Other sources') })
 		virtualList.push({ type: 'hint', id: 'loading_results_hint', hint: t('spreed', 'Loading …') })
 		return virtualList
 	}
 
 	// Add open conversations section if any
-	if (props.searchResultsListedConversations.length !== 0) {
+	if (showConversations && props.searchResultsListedConversations.length !== 0) {
 		virtualList.push({ type: 'caption', id: 'open_conversation_caption', name: t('spreed', 'Open conversations') })
 		props.searchResultsListedConversations.forEach((item: Conversation) => {
 			virtualList.push({ type: 'open_conversation', id: item.id, object: item })
 		})
 	}
 
-	// Categorize search results into different sections
-	const subList = props.searchResults.reduce<SubListType>((acc, result) => {
-		if (result.source === ATTENDEE.ACTOR_TYPE.USERS) {
-			acc.user.push(result)
-		} else if (result.source === ATTENDEE.ACTOR_TYPE.GROUPS && canStartConversations) {
-			acc.group.push(result)
-		} else if (result.source === ATTENDEE.ACTOR_TYPE.CIRCLES && canStartConversations) {
-			acc.circle.push(result)
-		} else if (result.source === ATTENDEE.ACTOR_TYPE.REMOTES && canStartConversations) {
-			acc.federated.push({ ...result, source: ATTENDEE.ACTOR_TYPE.FEDERATED_USERS })
+	// Add messages section
+	if (showMessages) {
+		virtualList.push({ type: 'caption', id: 'messages_caption', name: t('spreed', 'Messages') })
+		if (props.searchResultsMessages.length === 0) {
+			virtualList.push({
+				type: 'hint',
+				id: 'hint_messages',
+				hint: props.searchResultsLoading ? t('spreed', 'Loading …') : t('spreed', 'No matches found'),
+			})
+		} else {
+			props.searchResultsMessages.forEach((item: UnifiedSearchResultEntryWithRouterLink) => {
+				virtualList.push({ type: 'message', id: +item.attributes.messageId, object: item })
+			})
+			if (props.hasMoreMessages) {
+				virtualList.push({ type: 'load_more_messages', id: 'load_more_messages' })
+			}
 		}
-		return acc
-	}, {
-		user: [],
-		group: [],
-		circle: [],
-		federated: [],
-	})
+	}
 
-	// Iterate over sections and build the virtualList
-	sections.forEach((section) => {
-		if (subList[section.type].length > 0) {
-			virtualList.push(section.caption)
-			virtualList.push(...subList[section.type].map((match) => ({
-				type: section.type,
-				id: `${section.type}_${match.id}`,
-				object: match,
-				icon: iconData(match),
-			})))
-		}
-	})
+	// Categorize search results into different sections
+	if (showPeople) {
+		const subList = props.searchResults.reduce<SubListType>((acc, result) => {
+			if (result.source === ATTENDEE.ACTOR_TYPE.USERS) {
+				acc.user.push(result)
+			} else if (result.source === ATTENDEE.ACTOR_TYPE.GROUPS && canStartConversations) {
+				acc.group.push(result)
+			} else if (result.source === ATTENDEE.ACTOR_TYPE.CIRCLES && canStartConversations) {
+				acc.circle.push(result)
+			} else if (result.source === ATTENDEE.ACTOR_TYPE.REMOTES && canStartConversations) {
+				acc.federated.push({ ...result, source: ATTENDEE.ACTOR_TYPE.FEDERATED_USERS })
+			}
+			return acc
+		}, {
+			user: [],
+			group: [],
+			circle: [],
+			federated: [],
+		})
+
+		// Iterate over sections and build the virtualList
+		sections.forEach((section) => {
+			if (subList[section.type].length > 0) {
+				virtualList.push(section.caption)
+				virtualList.push(...subList[section.type].map((match) => ({
+					type: section.type,
+					id: `${section.type}_${match.id}`,
+					object: match,
+					icon: iconData(match),
+				})))
+			}
+		})
 
-	// Add "No results" message if there are no results in any section
-	if (!subList.user.length || !subList.group.length || (!subList.circle.length && isCirclesEnabled) || !subList.federated.length) {
-		virtualList.push({ type: 'caption', id: 'no_results_caption', name: sourcesWithoutResults(subList) })
-		virtualList.push({ type: 'hint', id: 'no_results_hint', hint: t('spreed', 'No search results') })
+		// Add "No results" message if there are no results in any section
+		if (!subList.user.length || !subList.group.length || (!subList.circle.length && isCirclesEnabled) || !subList.federated.length) {
+			virtualList.push({ type: 'caption', id: 'no_results_caption', name: sourcesWithoutResults(subList) })
+			virtualList.push({ type: 'hint', id: 'no_results_hint', hint: t('spreed', 'No search results') })
+		}
 	}
 
 	return virtualList
@@ -265,6 +306,31 @@ const iconSize = computed(() => isCompact.value ? AVATAR.SIZE.COMPACT : AVATAR.S
 					isSearchResult
 					:compact="isCompact"
 					@click="emit('abortSearch')" />
+				<SearchMessageItem
+					v-if="item.data.type === 'message'"
+					:ref="`message-${item.data.object.attributes.conversation}`"
+					:messageId="+item.data.object.attributes.messageId"
+					:title="isCompact ? item.data.object.subline : item.data.object.title"
+					:subline="item.data.object.subline"
+					:actorId="item.data.object.attributes.actorId"
+					:actorType="item.data.object.attributes.actorType"
+					:token="item.data.object.attributes.conversation"
+					:timestamp="+item.data.object.attributes.timestamp"
+					:to="item.data.object.to"
+					:compact="isCompact"
+					@click="emit('abortSearch')" />
+				<NcButton
+					v-else-if="item.data.type === 'load_more_messages'"
+					class="load-more-messages"
+					variant="tertiary"
+					wide
+					:disabled="messagesLoadingMore"
+					@click="emit('loadMoreMessages')">
+					<template v-if="messagesLoadingMore" #icon>
+						<NcLoadingIcon :size="20" />
+					</template>
+					{{ t('spreed', 'Show more messages') }}
+				</NcButton>
 				<NcAppNavigationCaption
 					v-else-if="item.data.type === 'caption'"
 					:name="item.data.name"
diff --git a/src/components/RightSidebar/SearchMessages/SearchMessageItem.vue b/src/components/RightSidebar/SearchMessages/SearchMessageItem.vue
index 097e007731a..36bd2aa4b41 100644
--- a/src/components/RightSidebar/SearchMessages/SearchMessageItem.vue
+++ b/src/components/RightSidebar/SearchMessages/SearchMessageItem.vue
@@ -17,7 +17,7 @@ import NcListItem from '@nextcloud/vue/components/NcListItem'
 import CloseCircleOutline from 'vue-material-design-icons/CloseCircleOutline.vue'
 import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
 import ConversationIcon from '../../ConversationIcon.vue'
-import { CONVERSATION } from '../../../constants.ts'
+import { AVATAR, CONVERSATION } from '../../../constants.ts'
 import { EventBus } from '../../../services/EventBus.ts'
 import { useDashboardStore } from '../../../stores/dashboard.ts'
 import { formatDateTime } from '../../../utils/formattedTime.ts'
@@ -34,6 +34,7 @@ const props = withDefaults(defineProps<{
 	timestamp: number
 	messageParameters?: ChatMessage['messageParameters']
 	isReminder?: boolean
+	compact?: boolean
 }>(), {
 	messageParameters: () => ({}),
 	isReminder: false,
@@ -88,6 +89,8 @@ function handleResultClick() {
 		:to="to"
 		:active="active"
 		:title="richSubline"
+		:compact
+		class="search-message"
 		forceMenu
 		@click="handleResultClick">
 		<template #icon>
@@ -96,6 +99,7 @@ function handleResultClick() {
 				:id="actorId"
 				:name="title"
 				:source="actorType"
+				:size="compact ? AVATAR.SIZE.COMPACT : AVATAR.SIZE.DEFAULT"
 				disableMenu
 				:token="token" />
 			<ConversationIcon
@@ -103,7 +107,7 @@ function handleResultClick() {
 				:item="conversation"
 				hideUserStatus />
 		</template>
-		<template #subname>
+		<template v-if="!compact" #subname>
 			{{ richSubline }}
 		</template>
 		<template v-if="isReminder" #actions>
@@ -119,7 +123,7 @@ function handleResultClick() {
 		<template #details>
 			<NcDateTime
 				:timestamp="timestamp * 1000"
-				class="search-results__date"
+				class="search-message__date"
 				relativeTime="short"
 				ignoreSeconds />
 		</template>
@@ -127,7 +131,14 @@ function handleResultClick() {
 </template>
 
 <style lang="scss" scoped>
-.search-results__date {
-	font-size: x-small;
+.search-message {
+	&__date {
+		font-size: x-small;
+	}
+
+	/* Overwrite NcListItem styles for compact view */
+	:deep(.list-item--compact .list-item-content__name) {
+		font-weight: 400;
+	}
 }
 </style>
diff --git a/src/components/RightSidebar/SearchMessages/SearchMessagesTab.vue b/src/components/RightSidebar/SearchMessages/SearchMessagesTab.vue
index 210ec520e67..9ad5d8f11d4 100644
--- a/src/components/RightSidebar/SearchMessages/SearchMessagesTab.vue
+++ b/src/components/RightSidebar/SearchMessages/SearchMessagesTab.vue
@@ -11,6 +11,7 @@ import type {
 	SearchMessagePayload,
 	UnifiedSearchResponse,
 	UnifiedSearchResultEntry,
+	UnifiedSearchResultEntryWithRouterLink,
 } from '../../../types/index.ts'
 
 import { isCancel } from '@nextcloud/axios'
@@ -36,7 +37,7 @@ import { useArrowNavigation } from '../../../composables/useArrowNavigation.js'
 import { useGetToken } from '../../../composables/useGetToken.ts'
 import { useIsInCall } from '../../../composables/useIsInCall.js'
 import { ATTENDEE } from '../../../constants.ts'
-import { searchMessages } from '../../../services/coreService.ts'
+import { searchMessagesInConversation } from '../../../services/coreService.ts'
 import { EventBus } from '../../../services/EventBus.ts'
 import CancelableRequest from '../../../utils/CancelableRequest.ts'
 
@@ -53,15 +54,7 @@ const searchBox = ref<InstanceType<typeof SearchBox> | null>(null)
 const { initializeNavigation, resetNavigation } = useArrowNavigation(searchMessagesTab, searchBox)
 
 const isFocused = ref(false)
-const searchResults = ref<(UnifiedSearchResultEntry & {
-	to: {
-		name: string
-		hash: string
-		params: {
-			token: string
-		}
-	}
-})[]>([])
+const searchResults = ref<UnifiedSearchResultEntryWithRouterLink[]>([])
 const searchText = ref('')
 const fromUser = ref<IUserData | undefined>(undefined)
 const sinceDate = ref<Date | null>(null)
@@ -182,7 +175,7 @@ async function fetchSearchResults(isNew = true): Promise<void> {
 		cancelSearchFn()
 		resetNavigation()
 
-		const { request, cancel } = CancelableRequest(searchMessages)
+		const { request, cancel } = CancelableRequest(searchMessagesInConversation)
 		cancelSearchFn = cancel
 
 		if (isNew) {
diff --git a/src/services/coreService.ts b/src/services/coreService.ts
index 34b66b095dc..ed9698468c7 100644
--- a/src/services/coreService.ts
+++ b/src/services/coreService.ts
@@ -104,7 +104,19 @@ async function deleteTaskById(id: number, options?: AxiosRequestConfig): Promise
  * @param params
  * @param options
  */
-async function searchMessages(params: SearchMessagePayload, options?: AxiosRequestConfig): UnifiedSearchResponse {
+async function searchMessagesEverywhere(params: SearchMessagePayload, options?: AxiosRequestConfig): UnifiedSearchResponse {
+	return axios.get(generateOcsUrl('search/providers/talk-message/search'), {
+		...options,
+		params,
+	})
+}
+
+/**
+ *
+ * @param params
+ * @param options
+ */
+async function searchMessagesInConversation(params: SearchMessagePayload, options?: AxiosRequestConfig): UnifiedSearchResponse {
 	return axios.get(generateOcsUrl('search/providers/talk-message-current/search'), {
 		...options,
 		params,
@@ -116,5 +128,6 @@ export {
 	deleteTaskById,
 	getTaskById,
 	getUserProfile,
-	searchMessages,
+	searchMessagesEverywhere,
+	searchMessagesInConversation,
 }
diff --git a/src/types/core.ts b/src/types/core.ts
index 56e89a9f2bd..1cd0bd58e52 100644
--- a/src/types/core.ts
+++ b/src/types/core.ts
@@ -117,6 +117,15 @@ export type SearchMessagePayload = operationsCore['unified_search-search']['para
 export type UnifiedSearchResultEntry = componentsCore['schemas']['UnifiedSearchResultEntry'] & {
 	attributes: MessageSearchResultAttributes
 }
+export type UnifiedSearchResultEntryWithRouterLink = UnifiedSearchResultEntry & {
+	to: {
+		name: string
+		hash: string
+		params: {
+			token: string
+		}
+	}
+}
 export type UnifiedSearchResponse = ApiResponse<operationsCore['unified_search-search']['responses'][200]['content']['application/json'] & {
 	ocs: {
 		meta: componentsCore['schemas']['OCSMeta']
diff --git a/src/types/index.ts b/src/types/index.ts
index 86170aa2b3d..c91e24cce68 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -653,6 +653,7 @@ export type {
 	SearchMessagePayload,
 	UnifiedSearchResponse,
 	UnifiedSearchResultEntry,
+	UnifiedSearchResultEntryWithRouterLink,
 } from './core.ts'
 
 // Translation API