diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue
index 532eda75b46..ffab9a2eeb9 100644
--- a/src/components/RightSidebar/RightSidebar.vue
+++ b/src/components/RightSidebar/RightSidebar.vue
@@ -93,6 +93,17 @@
 			</template>
 			<SharedItemsTab :active="activeTab === 'shared-items'" />
 		</NcAppSidebarTab>
+		<NcAppSidebarTab v-if="showSearchMessagesTab"
+			id="search-messages"
+			key="search-messages"
+			ref="searchMessgesTab"
+			:order="6"
+			:name="t('spreed', 'Search Messages')">
+			<template #icon>
+				<TextSearchVariant :size="20" />
+			</template>
+			<SearchMessagesTab :is-active="activeTab === 'search-messages'" />
+		</NcAppSidebarTab>
 	</NcAppSidebar>
 </template>
 
@@ -104,6 +115,7 @@ import FolderMultipleImage from 'vue-material-design-icons/FolderMultipleImage.v
 import InformationOutline from 'vue-material-design-icons/InformationOutline.vue'
 import Message from 'vue-material-design-icons/Message.vue'
 import MessageText from 'vue-material-design-icons/MessageText.vue'
+import TextSearchVariant from 'vue-material-design-icons/TextSearchVariant.vue'
 
 import { showMessage } from '@nextcloud/dialogs'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
@@ -116,6 +128,7 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import BreakoutRoomsTab from './BreakoutRooms/BreakoutRoomsTab.vue'
 import LobbyStatus from './LobbyStatus.vue'
 import ParticipantsTab from './Participants/ParticipantsTab.vue'
+import SearchMessagesTab from './SearchMessages/SearchMessagesTab.vue'
 import SharedItemsTab from './SharedItems/SharedItemsTab.vue'
 import SipSettings from './SipSettings.vue'
 import ChatView from '../ChatView.vue'
@@ -136,6 +149,7 @@ export default {
 		NcAppSidebarTab,
 		NcButton,
 		ParticipantsTab,
+		SearchMessagesTab,
 		SetGuestUsername,
 		SharedItemsTab,
 		SipSettings,
@@ -147,6 +161,7 @@ export default {
 		InformationOutline,
 		Message,
 		MessageText,
+		TextSearchVariant,
 	},
 
 	props: {
@@ -269,6 +284,10 @@ export default {
 			return this.getUserId && (!this.supportFederationV1 || !this.conversation.remoteServer)
 		},
 
+		showSearchMessagesTab() {
+			return this.getUserId
+		},
+
 		showDetailsTab() {
 			return !this.getUserId || this.showSIPSettings
 		},
diff --git a/src/components/RightSidebar/SearchMessages/SearchMessagesTab.vue b/src/components/RightSidebar/SearchMessages/SearchMessagesTab.vue
new file mode 100644
index 00000000000..41e891d960b
--- /dev/null
+++ b/src/components/RightSidebar/SearchMessages/SearchMessagesTab.vue
@@ -0,0 +1,405 @@
+<!--
+  - SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+<script setup lang="ts">
+import debounce from 'debounce'
+import type { Emitter } from 'mitt'
+import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
+import type { Route } from 'vue-router'
+import { useRouter } from 'vue-router/composables'
+
+import DotsHorizontal from 'vue-material-design-icons/DotsHorizontal.vue'
+
+import { showError } from '@nextcloud/dialogs'
+import { t } from '@nextcloud/l10n'
+
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import NcDateTime from '@nextcloud/vue/dist/Components/NcDateTime.js'
+import NcDateTimePicker from '@nextcloud/vue/dist/Components/NcDateTimePicker.js'
+import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
+import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
+import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
+
+import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
+import SearchBox from '../../UIShared/SearchBox.vue'
+import TransitionWrapper from '../../UIShared/TransitionWrapper.vue'
+
+import { useStore } from '../../../composables/useStore.js'
+import { EventBus } from '../../../services/EventBus.ts'
+import { searchMessages } from '../../../services/messagesService.ts'
+import CancelableRequest from '../../../utils/cancelableRequest.js'
+
+type UserFilterObject = {
+	id: string
+}
+
+type MessageSearchResultAttributes = {
+	conversation: string
+	messageId: string
+	actorType: string
+	actorId: string
+	timestamp: string
+}
+
+type MessageSearchResultEntry = {
+	subline: string
+	thumbnailUrl: string
+	title: string
+	resourceUrl: string
+	icon: string
+	rounded: boolean
+	attributes: MessageSearchResultAttributes
+}
+
+type Events = {
+  'route-change': { from: Route; to: Route }
+}
+
+type ExtendedEmitter = Emitter<Events>
+
+const typedEventBus = EventBus as ExtendedEmitter
+
+const props = defineProps<{
+	isActive: boolean
+}>()
+
+const searchBox = ref(null)
+const isFocused = ref(false)
+const searchResults = ref<MessageSearchResultEntry[]>([])
+const searchText = ref('')
+const fromUser = ref<UserFilterObject | null>(null)
+const sinceDate = ref<Date | null>(null)
+const untilDate = ref<Date | null>(null)
+const searchLimit = ref(10)
+const searchCursor = ref(0)
+const searchDetailsOpened = ref(false)
+const isFetchingResults = ref(false)
+const isSearchExhausted = ref(false)
+
+const router = useRouter()
+const store = useStore()
+
+const token = computed(() => store.getters.getToken())
+const participantsInitialised = computed(() => props.isActive ? store.getters.participantsInitialised(token.value) : false)
+const participants = computed<UserFilterObject>(() => {
+	if (!props.isActive) return []
+	return store.getters.participantsList(token.value)
+		.map(({ actorId, displayName, actorType }: { actorId: string; displayName: string; actorType: string}) => ({
+			id: actorId,
+			displayName,
+			isNoUser: actorType !== 'users',
+			subname: actorId,
+			user: actorId,
+			disableMenu: true,
+			showUserStatus: false,
+		}))
+})
+const canLoadMore = computed(() => !isSearchExhausted.value && !isFetchingResults.value && searchCursor.value !== 0)
+
+onMounted(() => {
+	typedEventBus.on('route-change', onRouteChange)
+})
+
+onBeforeUnmount(() => {
+	typedEventBus.off('route-change', onRouteChange)
+	abortSearch()
+})
+
+const onRouteChange = ({ from, to }: { from: Route, to: Route }): void => {
+	if (from.name === 'conversation'
+		&& to.name === 'conversation'
+		&& from.params.token === to.params.token) {
+		return
+	}
+	if (to.name === 'conversation') {
+		abortSearch()
+	}
+}
+
+/**
+ * Cancel search and cleanup the search fields and results.
+ */
+function abortSearch() {
+	cancelSearch.value('canceled')
+	searchText.value = ''
+	fromUser.value = null
+	sinceDate.value = null
+	untilDate.value = null
+	searchDetailsOpened.value = false
+	searchResults.value = []
+	searchCursor.value = 0
+}
+
+/**
+ * Continue fetching more search results
+ */
+function loadMore() {
+	return fetchSearchResults(false)
+}
+
+/**
+ *
+ */
+function fetchNewSearchResult() {
+	return fetchSearchResults(true)
+}
+
+const cancelSearch = ref((cancel: string) => {})
+
+/**
+ * @param [isNew=true] Is it a new search (search parameters changed)?
+ * Fetch the search results from the server
+ */
+async function fetchSearchResults(isNew = true) {
+	isFetchingResults.value = true
+
+	try {
+		cancelSearch.value('canceled')
+		const { request, cancel } = CancelableRequest(searchMessages)
+		cancelSearch.value = cancel
+
+		if (isNew) {
+			searchCursor.value = 0
+		}
+		if (searchCursor.value === 0) {
+			searchResults.value = []
+		}
+
+		const term = searchText.value.trim()
+		if (term.length === 0 && !fromUser.value && !sinceDate.value && !untilDate.value) {
+			return
+		}
+		const response = await request({
+			term: term.length !== 0 ? term : null,
+			person: fromUser.value?.id,
+			since: sinceDate.value?.toISOString(),
+			until: untilDate.value?.toISOString(),
+			limit: searchLimit.value,
+			cursor: searchCursor.value || null,
+			conversation: token.value,
+		})
+
+		const data = response?.data?.ocs?.data
+		if (data?.entries) {
+			let entries = data?.entries
+
+			isSearchExhausted.value = entries.length < searchLimit.value
+			searchCursor.value = data.cursor
+
+			// FIXME: remove the filter after the person filter is fixed on the server
+			if (fromUser.value) {
+				entries = entries.filter((entry) => entry.attributes.actorId === fromUser.value?.id)
+				if (entries.length === 0 && isSearchExhausted.value) {
+					return await loadMore()
+				}
+			}
+
+			searchResults.value = searchResults.value.concat(entries)
+		}
+	} catch (exception) {
+		if (CancelableRequest.isCancel(exception)) {
+			return
+		}
+		console.error('Error searching for messages', exception)
+		showError(t('spreed', 'An error occurred while performing the search'))
+	} finally {
+		isFetchingResults.value = false
+	}
+}
+
+/**
+ *
+ * @param date disabledDate from NcDateTimePicker
+ */
+function notBeforeSinceDate(date: Date) {
+	return sinceDate.value ? date.getDate() < sinceDate.value.getDate() : false
+}
+
+/**
+ *
+ * @param date disabledDate from NcDateTimePicker
+ */
+function notAfterUntilDate(date: Date) {
+	return date.getDate() > (untilDate.value?.getDate() ?? new Date().getDate())
+}
+
+/**
+ *
+ * @param date disabledTime from NcDateTimePicker
+ */
+function notBeforeSinceTime(date: Date) {
+	return sinceDate.value ? date.valueOf() < sinceDate.value?.valueOf() : false
+}
+
+/**
+ *
+ * @param date disabledTime from NcDateTimePicker
+ */
+function notAfterUntilTime(date: Date) {
+	return date.valueOf() > (untilDate.value?.valueOf() ?? Date.now())
+}
+
+/**
+ * Search result on click handler
+ * @param attributes Attributes from message search results
+ */
+function onClickMessageSearchResult(attributes: MessageSearchResultAttributes) {
+	router.push({
+		name: 'conversation',
+		hash: `#message_${attributes.messageId}`,
+		params: {
+			token: attributes.conversation,
+		},
+	}).catch(err => console.debug(`Error while pushing the new conversation's route: ${err}`))
+}
+
+const debounceFetchSearchResults = debounce(fetchNewSearchResult, 250)
+</script>
+
+<template>
+	<div class="search-messages-tab">
+		<div class="search-form">
+			<div class="search-form__search-box-wrapper">
+				<div class="search-form__main">
+					<SearchBox ref="searchBox"
+						:value.sync="searchText"
+						:is-focused.sync="isFocused"
+						@input="debounceFetchSearchResults" />
+					<TransitionWrapper name="radial-reveal">
+						<div v-show="searchDetailsOpened" class="search-form__search-detail">
+							<NcSelect v-model="fromUser"
+								class="search-form__search-detail__from-user"
+								:aria-label-combobox="t('spreed', 'From User')"
+								:placeholder="t('spreed', 'From User')"
+								user-select
+								:loading="!participantsInitialised"
+								:options="participants"
+								@update:modelValue="debounceFetchSearchResults" />
+							<NcDateTimePicker v-model="sinceDate"
+								class="search-form__search-detail__date-picker"
+								type="datetime"
+								format="YYYY-MM-DD HH:mm"
+								clearable
+								:aria-label="t('spreed', 'Since')"
+								:placeholder="t('spreed', 'Since')"
+								:disabled-date="notAfterUntilDate"
+								:disabled-time="notAfterUntilTime"
+								:minute-step="1"
+								@update:modelValue="debounceFetchSearchResults" />
+							<NcDateTimePicker v-model="untilDate"
+								class="search-form__search-detail__date-picker"
+								type="datetime"
+								format="YYYY-MM-DD HH:mm"
+								clearable
+								:aria-label="t('spreed', 'Until')"
+								:placeholder="t('spreed', 'Until')"
+								:disabled-date="notBeforeSinceDate"
+								:disabled-time="notBeforeSinceTime"
+								:minute-step="1"
+								@update:modelValue="debounceFetchSearchResults" />
+						</div>
+					</TransitionWrapper>
+				</div>
+				<NcButton :pressed.sync="searchDetailsOpened"
+					aria-label="Search Detail"
+					type="tertiary-no-background">
+					<template #icon>
+						<DotsHorizontal />
+					</template>
+				</NcButton>
+			</div>
+		</div>
+		<div class="search-results">
+			<template v-if="searchResults.length !== 0">
+				<NcListItem v-for="item of searchResults"
+					:key="`message_${item.attributes.messageId}`"
+					:data-nav-id="`message_${item.attributes.messageId}`"
+					:name="item.title"
+					:v-tooltip="item.subline"
+					@click="onClickMessageSearchResult(item.attributes)">
+					<template #icon>
+						<AvatarWrapper :id="item.attributes.actorId"
+							:name="item.title"
+							:source="item.attributes.actorType"
+							:disable-menu="true"
+							token="new"
+							:show-user-status="true" />
+					</template>
+					<template #subname>
+						{{ item.subline }}
+					</template>
+					<template #details>
+						<NcDateTime :timestamp="parseInt(item.attributes.timestamp) * 1000"
+							class="search-results__date"
+							relative-time="narrow"
+							ignore-seconds />
+					</template>
+				</NcListItem>
+			</template>
+			<template v-if="canLoadMore">
+				<NcButton wide type="tertiary" @click="fetchSearchResults(false)">
+					{{ t('spreed', 'Load more results') }}
+				</NcButton>
+			</template>
+			<template v-if="isFetchingResults">
+				<NcLoadingIcon class="search-results__loading" />
+			</template>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" scoped>
+.search-messages-tab {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.search-form {
+	display: flex;
+	flex-direction: column;
+
+	&__search-box-wrapper {
+		display: flex;
+		gap: var(--default-grid-baseline);
+	}
+
+	&__main {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+	}
+
+	&__search-detail {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+
+		&__from-user {
+			margin-top: 8px;
+			:deep(.vs__dropdown-toggle) {
+				overflow-y: clip;
+			}
+		}
+
+		&__date-picker {
+			width: 100%;
+		}
+	}
+}
+
+.search-results {
+	transition: all 0.15s ease;
+	height: 100%;
+
+	&__date {
+		font-size: x-small;
+	}
+
+	&__loading {
+		height: var(--default-clickable-area);
+	}
+}
+</style>
diff --git a/src/services/messagesService.ts b/src/services/messagesService.ts
index 1650f1834ba..870b7d9c2e8 100644
--- a/src/services/messagesService.ts
+++ b/src/services/messagesService.ts
@@ -36,6 +36,7 @@ type PostNewMessagePayload = Omit<postNewMessageParams, 'replyTo'> & { token: st
 type PostNewMessageOptions = Pick<postNewMessageParams, 'silent'> & object
 type DeleteMessagePayload = { token: string, id: number }
 type EditMessagePayload = { token: string, messageId: number, updatedMessage: editMessageParams['message'] }
+type SearchMessagePayload = { term: string, person?: string, since?: string, until?: string, cursor?: number, limit?: number, conversation?: string }
 
 /**
  * Fetches messages that belong to a particular conversation
@@ -224,6 +225,13 @@ const summarizeChat = async function(token: string, fromMessageId: summarizeChat
 	} as summarizeChatParams, options)
 }
 
+const searchMessages = async function(params: SearchMessagePayload, options: object) {
+	return axios.get(generateOcsUrl('search/providers/talk-message/search'), {
+		...options,
+		params,
+	}).catch(() => {})
+}
+
 export {
 	fetchMessages,
 	lookForNewMessages,
@@ -236,4 +244,5 @@ export {
 	updateLastReadMessage,
 	setConversationUnread,
 	summarizeChat,
+	searchMessages,
 }