diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
index 6bc3a8dffa9..664129de9f8 100644
--- a/src/components/LeftSidebar/LeftSidebar.vue
+++ b/src/components/LeftSidebar/LeftSidebar.vue
@@ -266,6 +266,7 @@
 				:conversations-list="conversationsList"
 				:search-results="searchResults"
 				:search-results-listed-conversations="searchResultsListedConversations"
+				:search-results-messages="searchResultsMessages"
 				@abort-search="abortSearch"
 				@create-new-conversation="createConversation"
 				@create-and-join-conversation="createAndJoinConversation" />
@@ -354,7 +355,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'
@@ -477,11 +481,14 @@ export default {
 			searchText: '',
 			searchResults: [],
 			searchResultsListedConversations: [],
+			searchResultsMessages: [],
 			contactsLoading: false,
 			listedConversationsLoading: false,
+			messagesLoading: false,
 			canStartConversations: getTalkConfig('local', 'conversations', 'can-create'),
 			cancelSearchPossibleConversations: () => {},
 			cancelSearchListedConversations: () => {},
+			cancelSearchMessages: () => {},
 			debounceFetchSearchResults: () => {},
 			debounceFetchConversations: () => {},
 			debounceHandleScroll: () => {},
@@ -690,6 +697,9 @@ export default {
 		this.cancelSearchListedConversations()
 		this.cancelSearchListedConversations = null
 
+		this.cancelSearchMessages()
+		this.cancelSearchMessages = null
+
 		if (this.refreshTimer) {
 			clearInterval(this.refreshTimer)
 			this.refreshTimer = null
@@ -814,6 +824,44 @@ export default {
 			}
 		},
 
+		async fetchMessagesEverywhere() {
+			try {
+				this.messagesLoading = true
+
+				this.cancelSearchMessages('canceled')
+				const { request, cancel } = CancelableRequest(searchMessagesEverywhere)
+				this.cancelSearchMessages = cancel
+
+				const response = await request({
+					term: this.searchText,
+					limit: 5,
+				})
+				const data = response?.data?.ocs?.data
+				if (data && data.entries.length > 0) {
+					this.searchResultsMessages = data.entries.map((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 },
+							},
+						}
+					})
+				}
+				this.messagesLoading = false
+			} 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 fetchSearchResults() {
 			if (!this.isSearching) {
 				return
@@ -824,7 +872,11 @@ export default {
 			this.showThreadsList = false
 
 			this.resetNavigation()
-			await Promise.all([this.fetchPossibleConversations(), this.fetchListedConversations()])
+			await Promise.all([
+				this.fetchPossibleConversations(),
+				this.fetchListedConversations(),
+				this.fetchMessagesEverywhere(),
+			])
 			this.initializeNavigation()
 		},
 
@@ -890,6 +942,9 @@ export default {
 			if (this.cancelSearchListedConversations) {
 				this.cancelSearchListedConversations()
 			}
+			if (this.cancelSearchMessages) {
+				this.cancelSearchMessages()
+			}
 		},
 
 		showSettings() {
diff --git a/src/components/LeftSidebar/SearchConversationsResults/SearchConversationsResults.vue b/src/components/LeftSidebar/SearchConversationsResults/SearchConversationsResults.vue
index d6dbc8e92e9..41b2d07011e 100644
--- a/src/components/LeftSidebar/SearchConversationsResults/SearchConversationsResults.vue
+++ b/src/components/LeftSidebar/SearchConversationsResults/SearchConversationsResults.vue
@@ -4,7 +4,11 @@
 -->
 
 <script setup lang="ts">
-import type { ParticipantSearchResult, Conversation as TypeConversation } from '../../../types/index.ts'
+import type {
+	ParticipantSearchResult,
+	Conversation as TypeConversation,
+	UnifiedSearchResultEntryWithRouterLink,
+} from '../../../types/index.ts'
 
 import { loadState } from '@nextcloud/initial-state'
 import { t } from '@nextcloud/l10n'
@@ -15,6 +19,7 @@ import NcListItem from '@nextcloud/vue/components/NcListItem'
 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'
@@ -28,6 +33,7 @@ const props = defineProps<{
 	contactsLoading: boolean
 	searchResultsListedConversations: TypeConversation[]
 	searchResults: ParticipantSearchResult[]
+	searchResultsMessages: UnifiedSearchResultEntryWithRouterLink[]
 }>()
 
 const emit = defineEmits<{
@@ -75,6 +81,7 @@ type VirtualListItem
 	= | { type: 'caption', id: string, name: string }
 		| { type: 'hint', id: string, hint: string }
 		| { type: 'conversation', id: number, object: TypeConversation }
+		| { type: 'message', id: number, object: UnifiedSearchResultEntryWithRouterLink }
 		| { type: 'open_conversation', id: number, object: TypeConversation }
 		| { type: 'action', id: string, name: string, subname: string }
 		| { type: 'user' | 'group' | 'circle' | 'federated', id: string, object: ParticipantSearchResult, icon: Record<string, unknown> }
@@ -113,6 +120,16 @@ const searchResultsVirtual = computed<VirtualListItem[]>(() => {
 		})
 	}
 
+	// Add messages section
+	virtualList.push({ type: 'caption', id: 'messages_caption', name: t('spreed', 'Messages') })
+	if (props.searchResultsMessages.length === 0) {
+		virtualList.push({ type: 'hint', id: 'hint_messages', hint: t('spreed', 'No matches found') })
+	} else {
+		props.searchResultsMessages.forEach((item: UnifiedSearchResultEntryWithRouterLink) => {
+			virtualList.push({ type: 'message', id: +item.attributes.messageId, object: item })
+		})
+	}
+
 	// Categorize search results into different sections
 	const subList = props.searchResults.reduce<SubListType>((acc, result) => {
 		if (result.source === ATTENDEE.ACTOR_TYPE.USERS) {
@@ -269,6 +286,19 @@ const iconSize = computed(() => isCompact.value ? AVATAR.SIZE.COMPACT : AVATAR.S
 					is-search-result
 					:compact="isCompact"
 					@click="emit('abort-search')" />
+				<SearchMessageItem
+					v-if="item.data.type === 'message'"
+					:ref="`message-${item.data.object.attributes.conversation}`"
+					:message-id="+item.data.object.attributes.messageId"
+					:title="isCompact ? item.data.object.subline : item.data.object.title"
+					:subline="item.data.object.subline"
+					:actor-id="item.data.object.attributes.actorId"
+					:actor-type="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('abort-search')" />
 				<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 255c6f142c3..95ba0678fc9 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"
 		force-menu
 		@click="handleResultClick">
 		<template #icon>
@@ -96,6 +99,7 @@ function handleResultClick() {
 				:id="actorId"
 				:name="title"
 				:source="actorType"
+				:size="compact ? AVATAR.SIZE.COMPACT : AVATAR.SIZE.DEFAULT"
 				disable-menu
 				:token="token" />
 			<ConversationIcon
@@ -103,7 +107,7 @@ function handleResultClick() {
 				:item="conversation"
 				hide-user-status />
 		</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"
 				relative-time="short"
 				ignore-seconds />
 		</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 ffaa67366d5..c6f29d9249f 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 { showError } from '@nextcloud/dialogs'
@@ -35,7 +36,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.js'
 
@@ -51,15 +52,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)
@@ -180,7 +173,7 @@ async function fetchSearchResults(isNew = true): Promise<void> {
 		cancelSearchFn()
 		resetNavigation()
 
-		const { request, cancel } = CancelableRequest(searchMessages) as SearchMessageCancelableRequest
+		const { request, cancel } = CancelableRequest(searchMessagesInConversation) as SearchMessageCancelableRequest
 		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 e2253a3e10f..34c270c65e8 100644
--- a/src/types/core.ts
+++ b/src/types/core.ts
@@ -110,6 +110,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 9d12fbae997..ab9f280460e 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -488,6 +488,7 @@ export type {
 	SearchMessagePayload,
 	UnifiedSearchResponse,
 	UnifiedSearchResultEntry,
+	UnifiedSearchResultEntryWithRouterLink,
 } from './core.ts'
 
 // Files API