diff --git a/core/src/components/ConversationConstants.js b/core/src/components/ConversationConstants.js
new file mode 100644
index 0000000000000..647b2454b0ea7
--- /dev/null
+++ b/core/src/components/ConversationConstants.js
@@ -0,0 +1,64 @@
+export const CONVERSATION = {
+	START_CALL: {
+		EVERYONE: 0,
+		USERS: 1,
+		MODERATORS: 2,
+	},
+
+	STATE: {
+		READ_WRITE: 0,
+		READ_ONLY: 1,
+	},
+
+	LISTABLE: {
+		NONE: 0,
+		USERS: 1,
+		ALL: 2,
+	},
+
+	TYPE: {
+		ONE_TO_ONE: 1,
+		GROUP: 2,
+		PUBLIC: 3,
+		CHANGELOG: 4,
+		ONE_TO_ONE_FORMER: 5,
+		NOTE_TO_SELF: 6,
+	},
+
+	BREAKOUT_ROOM_MODE: {
+		NOT_CONFIGURED: 0,
+		AUTOMATIC: 1,
+		MANUAL: 2,
+		FREE: 3,
+	},
+
+	BREAKOUT_ROOM_STATUS: {
+		// Main room
+		STOPPED: 0,
+		STARTED: 1,
+		// Breakout rooms
+		STATUS_ASSISTANCE_RESET: 0,
+		STATUS_ASSISTANCE_REQUESTED: 2,
+	},
+
+	OBJECT_TYPE: {
+		EMAIL: 'emails',
+		FILE: 'file',
+		PHONE: 'phone',
+		VIDEO_VERIFICATION: 'share:password',
+		BREAKOUT_ROOM: 'room',
+		DEFAULT: '',
+	},
+}
+
+export const AVATAR = {
+	SIZE: {
+		EXTRA_SMALL: 22,
+		SMALL: 32,
+		DEFAULT: 44,
+		MEDIUM: 64,
+		LARGE: 128,
+		EXTRA_LARGE: 180,
+		FULL: 512,
+	},
+}
diff --git a/core/src/components/UnifiedSearch/ConversationIcon.vue b/core/src/components/UnifiedSearch/ConversationIcon.vue
new file mode 100644
index 0000000000000..77e3877db4304
--- /dev/null
+++ b/core/src/components/UnifiedSearch/ConversationIcon.vue
@@ -0,0 +1,266 @@
+<!--
+  - @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com>
+  -
+  - @author Joas Schilling <coding@schilljs.com>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<template>
+	<div class="conversation-icon" :style="{ '--icon-size': `${size}px` }" :class="{ 'offline': offline }">
+		<div v-if="iconClass" class="avatar icon" :class="iconClass" />
+		<!-- img is used here instead of NcAvatar to explicitly set key required to avoid glitching in virtual scrolling  -->
+		<img v-else-if="!isOneToOne"
+			:key="avatarUrl"
+			:src="avatarUrl"
+			:width="size"
+			:height="size"
+			:alt="item.displayName"
+			class="avatar icon">
+		<!-- NcAvatar doesn't fully support props update and works only for 1 user -->
+		<!-- Using key on NcAvatar forces NcAvatar re-mount and solve the problem, could not really optimal -->
+		<!-- TODO: Check if props update support in NcAvatar is more performant -->
+		<NcAvatar v-else
+			:key="item.token"
+			:size="size"
+			:user="item.name"
+			:disable-menu="disableMenu"
+			:display-name="item.displayName"
+			:preloaded-user-status="preloadedUserStatus"
+			:show-user-status="!hideUserStatus"
+			:show-user-status-compact="!showUserOnlineStatus"
+			:menu-container="menuContainer"
+			class="conversation-icon__avatar" />
+		<div v-if="showCall" class="overlap-icon">
+			<VideoIcon :size="20" :fill-color="'#E9322D'" />
+			<span class="hidden-visually">{{ t('spreed', 'Call in progress') }}</span>
+		</div>
+		<div v-else-if="showFavorite" class="overlap-icon">
+			<Star :size="20" :fill-color="'#FFCC00'" />
+			<span class="hidden-visually">{{ t('spreed', 'Favorite') }}</span>
+		</div>
+	</div>
+</template>
+
+<script>
+import Star from 'vue-material-design-icons/Star.vue'
+import VideoIcon from 'vue-material-design-icons/Video.vue'
+
+import { getCapabilities } from '@nextcloud/capabilities'
+import { generateOcsUrl } from '@nextcloud/router'
+
+import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
+
+import { AVATAR, CONVERSATION } from '../ConversationConstants.js'
+
+const supportsAvatar = getCapabilities()?.spreed?.features?.includes('avatar')
+
+export default {
+	name: 'ConversationIcon',
+
+	components: {
+		NcAvatar,
+		Star,
+		VideoIcon,
+	},
+
+	props: {
+		/**
+		 * Allow to hide the favorite icon, e.g. on mentions
+		 */
+		hideFavorite: {
+			type: Boolean,
+			default: true,
+		},
+
+		hideCall: {
+			type: Boolean,
+			default: true,
+		},
+
+		disableMenu: {
+			type: Boolean,
+			default: true,
+		},
+
+		hideUserStatus: {
+			type: Boolean,
+			default: false,
+		},
+
+		showUserOnlineStatus: {
+			type: Boolean,
+			default: false,
+		},
+
+		item: {
+			type: Object,
+			default() {
+				return {
+					objectType: '',
+					type: 0,
+					displayName: '',
+					isFavorite: false,
+				}
+			},
+		},
+
+		/**
+		 * Reduces the opacity of the icon if true
+		 */
+		offline: {
+			type: Boolean,
+			default: false,
+		},
+
+		size: {
+			type: Number,
+			default: AVATAR.SIZE.DEFAULT,
+		},
+	},
+
+	computed: {
+		showCall() {
+			return !this.hideCall && this.item.hasCall
+		},
+
+		showFavorite() {
+			return !this.hideFavorite && this.item.isFavorite
+		},
+
+		preloadedUserStatus() {
+			if (!this.hideUserStatus && Object.prototype.hasOwnProperty.call(this.item, 'statusMessage')) {
+				// We preloaded the status
+				return {
+					status: this.item.status || null,
+					message: this.item.statusMessage || null,
+					icon: this.item.statusIcon || null,
+				}
+			}
+			return undefined
+		},
+
+		menuContainer() {
+			// The store may not be defined in the RoomSelector if used from
+			// the Collaboration menu outside Talk.
+			return this.$store?.getters.getMainContainerSelector()
+		},
+
+		iconClass() {
+			if (this.item.isDummyConversation) {
+				// Prevent a 404 when trying to load an avatar before the conversation data is actually loaded
+				return 'icon-contacts'
+			}
+
+			if (!supportsAvatar) {
+				if (this.item.objectType === CONVERSATION.OBJECT_TYPE.FILE) {
+					return 'icon-file'
+				} else if (this.item.objectType === CONVERSATION.OBJECT_TYPE.VIDEO_VERIFICATION) {
+					return 'icon-password'
+				} else if (this.item.objectType === CONVERSATION.OBJECT_TYPE.EMAIL) {
+					return 'icon-mail'
+				} else if (this.item.objectType === CONVERSATION.OBJECT_TYPE.PHONE) {
+					return 'icon-phone'
+				} else if (this.item.type === CONVERSATION.TYPE.CHANGELOG) {
+					return 'icon-changelog'
+				} else if (this.item.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER) {
+					return 'icon-user'
+				} else if (this.item.type === CONVERSATION.TYPE.GROUP) {
+					return 'icon-contacts'
+				} else if (this.item.type === CONVERSATION.TYPE.PUBLIC) {
+					return 'icon-public'
+				}
+				return undefined
+			}
+
+			if (this.item.token) {
+				// Existing conversations use the /avatar endpoint… Always!
+				return undefined
+			}
+
+			if (this.item.type === CONVERSATION.TYPE.GROUP) {
+				// Group icon for group conversation suggestions
+				return 'icon-contacts'
+			}
+
+			if (this.item.type === CONVERSATION.TYPE.PUBLIC) {
+				// Public icon for new conversation dialog
+				return 'icon-public'
+			}
+
+			// Fall-through for other conversation suggestions to user-avatar handling
+			return undefined
+		},
+
+		isOneToOne() {
+			return this.item.type === CONVERSATION.TYPE.ONE_TO_ONE
+		},
+		checkIfDarkTheme() {
+			// Nextcloud uses --background-invert-if-dark for dark theme filters in CSS
+			// Values:
+			// - 'invert(100%)' for dark theme
+			// - 'no' for light theme
+			return window.getComputedStyle(document.body).getPropertyValue('--background-invert-if-dark') === 'invert(100%)'
+		},
+		avatarUrl() {
+			if (!supportsAvatar) {
+				return undefined
+			}
+
+			const avatarEndpoint = 'apps/spreed/api/v1/room/{token}/avatar' + (this.checkIfDarkTheme ? '/dark' : '')
+
+			return generateOcsUrl(avatarEndpoint + '?v={avatarVersion}', {
+				token: this.item.token,
+				avatarVersion: this.item.avatarVersion,
+			})
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.conversation-icon {
+    width: var(--icon-size);
+    height: var(--icon-size);
+    position: relative;
+
+    .avatar.icon {
+        display: block;
+        width: var(--icon-size);
+        height: var(--icon-size);
+        line-height: var(--icon-size);
+        background-size: calc(var(--icon-size) / 2);
+        background-color: var(--color-background-darker);
+
+        &.icon-changelog {
+            background-size: cover !important;
+        }
+    }
+
+    .overlap-icon {
+        position: absolute;
+        top: 0;
+        left: calc(var(--icon-size) - 12px);
+        line-height: 100%;
+        display: inline-block;
+        vertical-align: middle;
+    }
+}
+
+.offline {
+    opacity: .4;
+}
+</style>
diff --git a/core/src/store/index.js b/core/src/store/index.js
new file mode 100644
index 0000000000000..d263a5dc40740
--- /dev/null
+++ b/core/src/store/index.js
@@ -0,0 +1,11 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import search from './unified-search-external-filters';
+
+Vue.use(Vuex);
+
+export default new Vuex.Store({
+    modules: {
+        search,
+    },
+});
diff --git a/core/src/store/unified-search-external-filters.js b/core/src/store/unified-search-external-filters.js
new file mode 100644
index 0000000000000..b55335c4a0ae6
--- /dev/null
+++ b/core/src/store/unified-search-external-filters.js
@@ -0,0 +1,42 @@
+/*
+ * @copyright Copyright (c) 2021 Fon E. Noel NFEBE <me@nfebe.com>
+ *
+ * @author Fon E. Noel NFEBE <me@nfebe.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+const state = {
+	externalFilters: [],
+}
+
+const mutations = {
+	registerExternalFilter(state, { id, label, callback, icon }) {
+		state.externalFilters.push({ id, name: label, callback, icon, isPluginFilter: true })
+	},
+}
+
+const actions = {
+	registerExternalFilter({ commit }, { id, label, callback, icon }) {
+		commit('registerExternalFilter', { id, label, callback, icon })
+	},
+}
+
+export default {
+	state,
+	mutations,
+	actions,
+}
diff --git a/core/src/unified-search.js b/core/src/unified-search.js
index f9bddff4c6837..8650a2566d89a 100644
--- a/core/src/unified-search.js
+++ b/core/src/unified-search.js
@@ -26,6 +26,7 @@ import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 import Vue from 'vue'
 
 import UnifiedSearch from './views/UnifiedSearch.vue'
+import store from '../src/store/index.js'
 
 // eslint-disable-next-line camelcase
 __webpack_nonce__ = btoa(getRequestToken())
@@ -47,9 +48,24 @@ Vue.mixin({
 	},
 })
 
+// Register the add/register filter action API globally
+window.OCA.Core = window.OCA.Core || {}
+window.OCA.Core.UnifiedSearch = {
+	registerFilterAction: ({ id, name, label, callback, icon }) => {
+		store.dispatch('registerExternalFilter', {
+			id,
+			name,
+			label,
+			icon,
+			callback,
+		})
+	},
+}
+
 export default new Vue({
 	el: '#unified-search',
 	// eslint-disable-next-line vue/match-component-file-name
 	name: 'UnifiedSearchRoot',
+	store,
 	render: h => h(UnifiedSearch),
 })
diff --git a/core/src/views/UnifiedSearchModal.vue b/core/src/views/UnifiedSearchModal.vue
index 9c719d2bcf6a3..28ca2cd588c05 100644
--- a/core/src/views/UnifiedSearchModal.vue
+++ b/core/src/views/UnifiedSearchModal.vue
@@ -1,29 +1,20 @@
 <template>
-	<NcModal id="unified-search"
-		ref="unifiedSearchModal"
-		:show.sync="internalIsVisible"
-		:clear-view-delay="0"
+	<NcModal id="unified-search" ref="unifiedSearchModal" :show.sync="internalIsVisible" :clear-view-delay="0"
 		@close="closeModal">
-		<CustomDateRangeModal :is-open="showDateRangeModal"
-			class="unified-search__date-range"
-			@set:custom-date-range="setCustomDateRange"
-			@update:is-open="showDateRangeModal = $event" />
+		<CustomDateRangeModal :is-open="showDateRangeModal" class="unified-search__date-range"
+			@set:custom-date-range="setCustomDateRange" @update:is-open="showDateRangeModal = $event" />
 		<!-- Unified search form -->
 		<div ref="unifiedSearch" class="unified-search-modal">
 			<div class="unified-search-modal__header">
 				<h2>{{ t('core', 'Unified search') }}</h2>
-				<NcInputField ref="searchInput"
-					:value.sync="searchQuery"
-					type="text"
-					:label="t('core', 'Search apps, files, tags, messages') + '...'"
-					@update:value="debouncedFind" />
+				<NcInputField ref="searchInput" :value.sync="searchQuery" type="text"
+					:label="t('core', 'Search apps, files, tags, messages') + '...'" @update:value="debouncedFind" />
 				<div class="unified-search-modal__filters">
-					<NcActions :menu-name="t('core', 'Apps and Settings')" :open.sync="providerActionMenuIsOpen">
+					<NcActions :menu-name="t('core', 'Places')" :open.sync="providerActionMenuIsOpen">
 						<template #icon>
 							<ListBox :size="20" />
 						</template>
-						<NcActionButton v-for="provider in providers"
-							:key="provider.id"
+						<NcActionButton v-for="provider in providers" :key="provider.id"
 							@click="addProviderFilter(provider)">
 							<template #icon>
 								<img :src="provider.icon" class="filter-button__icon" alt="">
@@ -54,10 +45,8 @@
 							{{ t('core', 'Custom date range') }}
 						</NcActionButton>
 					</NcActions>
-					<SearchableList :label-text="t('core', 'Search people')"
-						:search-list="userContacts"
-						:empty-content-text="t('core', 'Not found')"
-						@search-term-change="debouncedFilterContacts"
+					<SearchableList :label-text="t('core', 'Search people')" :search-list="userContacts"
+						:empty-content-text="t('core', 'Not found')" @search-term-change="debouncedFilterContacts"
 						@item-selected="applyPersonFilter">
 						<template #trigger>
 							<NcButton>
@@ -76,18 +65,11 @@
 					</NcButton>
 				</div>
 				<div class="unified-search-modal__filters-applied">
-					<FilterChip v-for="filter in filters"
-						:key="filter.id"
-						:text="filter.name ?? filter.text"
-						:pretext="''"
+					<FilterChip v-for="filter in filters" :key="filter.id" :text="filter.name ?? filter.text" :pretext="''"
 						@delete="removeFilter(filter)">
 						<template #icon>
-							<NcAvatar v-if="filter.type === 'person'"
-								:user="filter.user"
-								:size="24"
-								:disable-menu="true"
-								:show-user-status="false"
-								:hide-favorite="false" />
+							<NcAvatar v-if="filter.type === 'person'" :user="filter.user" :size="24" :disable-menu="true"
+								:show-user-status="false" :hide-favorite="false" />
 							<CalendarRangeIcon v-else-if="filter.type === 'date'" />
 							<img v-else :src="filter.icon" alt="">
 						</template>
@@ -152,6 +134,7 @@ import SearchResult from '../components/UnifiedSearch/SearchResult.vue'
 import debounce from 'debounce'
 import { emit } from '@nextcloud/event-bus'
 import { useBrowserLocation } from '@vueuse/core'
+import { mapState } from 'vuex'
 import { getProviders, search as unifiedSearch, getContacts } from '../services/UnifiedSearchService.js'
 
 export default {
@@ -193,6 +176,7 @@ export default {
 	},
 	data() {
 		return {
+			searchScope: 'everywhere',
 			providers: [],
 			providerActionMenuIsOpen: false,
 			dateActionMenuIsOpen: false,
@@ -217,6 +201,9 @@ export default {
 	},
 
 	computed: {
+		...mapState({
+			externalFilters: state => state.search.externalFilters,
+		}),
 		userContacts() {
 			return this.contacts
 		},
@@ -252,6 +239,9 @@ export default {
 	mounted() {
 		getProviders().then((providers) => {
 			this.providers = providers
+			this.externalFilters.forEach(filter => {
+				this.providers.push(filter)
+			})		
 			console.debug('Search providers', this.providers)
 		})
 		getContacts({ searchTerm: '' }).then((contacts) => {
@@ -267,6 +257,16 @@ export default {
 				this.searching = false
 				return
 			}
+			switch (this.searchScope) {
+				case 'everywhere':
+					// Code to execute if searchScope is 'everywhere'
+					break
+				case 'conversation':
+					// Code to execute if searchScope is 'conversation'
+					break
+				default:
+				// Code to execute if searchScope is neither 'everywhere' nor 'conversation'
+			}
 			// Event should probably be refactored at some point to used nextcloud:unified-search.search
 			emit('nextcloud:unified-search.search', { query })
 			const newResults = []
@@ -404,6 +404,9 @@ export default {
 		},
 		addProviderFilter(providerFilter, loadMoreResultsForProvider = false) {
 			if (!providerFilter.id) return
+			if (providerFilter.isPluginFilter) {
+				providerFilter.callback()
+			}
 			this.providerResultLimit = loadMoreResultsForProvider ? this.providerResultLimit : 5
 			this.providerActionMenuIsOpen = false
 			const existingFilter = this.filteredProviders.find(existing => existing.id === providerFilter.id)
@@ -481,39 +484,39 @@ export default {
 			let endDate
 
 			switch (range) {
-			case 'today':
-				// For 'Today', both start and end are set to today
-				startDate = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 0, 0, 0, 0)
-				endDate = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59, 999)
-				this.dateFilter.text = t('core', 'Today')
-				break
-			case '7days':
-				// For 'Last 7 days', start date is 7 days ago, end is today
-				startDate = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 6, 0, 0, 0, 0)
-				this.dateFilter.text = t('core', 'Last 7 days')
-				break
-			case '30days':
-				// For 'Last 30 days', start date is 30 days ago, end is today
-				startDate = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 29, 0, 0, 0, 0)
-				this.dateFilter.text = t('core', 'Last 30 days')
-				break
-			case 'thisyear':
-				// For 'This year', start date is the first day of the year, end is the last day of the year
-				startDate = new Date(today.getFullYear(), 0, 1, 0, 0, 0, 0)
-				endDate = new Date(today.getFullYear(), 11, 31, 23, 59, 59, 999)
-				this.dateFilter.text = t('core', 'This year')
-				break
-			case 'lastyear':
-				// For 'Last year', start date is the first day of the previous year, end is the last day of the previous year
-				startDate = new Date(today.getFullYear() - 1, 0, 1, 0, 0, 0, 0)
-				endDate = new Date(today.getFullYear() - 1, 11, 31, 23, 59, 59, 999)
-				this.dateFilter.text = t('core', 'Last year')
-				break
-			case 'custom':
-				this.showDateRangeModal = true
-				return
-			default:
-				return
+				case 'today':
+					// For 'Today', both start and end are set to today
+					startDate = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 0, 0, 0, 0)
+					endDate = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59, 999)
+					this.dateFilter.text = t('core', 'Today')
+					break
+				case '7days':
+					// For 'Last 7 days', start date is 7 days ago, end is today
+					startDate = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 6, 0, 0, 0, 0)
+					this.dateFilter.text = t('core', 'Last 7 days')
+					break
+				case '30days':
+					// For 'Last 30 days', start date is 30 days ago, end is today
+					startDate = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 29, 0, 0, 0, 0)
+					this.dateFilter.text = t('core', 'Last 30 days')
+					break
+				case 'thisyear':
+					// For 'This year', start date is the first day of the year, end is the last day of the year
+					startDate = new Date(today.getFullYear(), 0, 1, 0, 0, 0, 0)
+					endDate = new Date(today.getFullYear(), 11, 31, 23, 59, 59, 999)
+					this.dateFilter.text = t('core', 'This year')
+					break
+				case 'lastyear':
+					// For 'Last year', start date is the first day of the previous year, end is the last day of the previous year
+					startDate = new Date(today.getFullYear() - 1, 0, 1, 0, 0, 0, 0)
+					endDate = new Date(today.getFullYear() - 1, 11, 31, 23, 59, 59, 999)
+					this.dateFilter.text = t('core', 'Last year')
+					break
+				case 'custom':
+					this.showDateRangeModal = true
+					return
+				default:
+					return
 			}
 			this.dateFilter.startFrom = startDate
 			this.dateFilter.endAt = endDate
@@ -527,6 +530,15 @@ export default {
 			this.dateFilter.text = t('core', `Between ${this.dateFilter.startFrom.toLocaleDateString()} and ${this.dateFilter.endAt.toLocaleDateString()}`)
 			this.updateDateFilter()
 		},
+		setSearchScopeToConversation(event) {
+			for (const provider of this.filteredProviders) {
+				if (provider.id === 'inConversation') {
+					provider.name = `Search in talk room : ${event.displayName}`
+					break
+				}
+			}
+			console.debug('Search scope set to conversation', event)
+		},
 		focusInput() {
 			this.$refs.searchInput.$el.children[0].children[0].focus()
 		},
@@ -549,7 +561,7 @@ export default {
 	padding-block: 10px 0;
 
 	// inline padding on direct children to make sure the scrollbar is on the modal container
-	> * {
+	>* {
 		padding-inline: 20px;
 	}