diff --git a/src/components/MailboxThread.vue b/src/components/MailboxThread.vue
index 95aaa40025..1a74334e17 100644
--- a/src/components/MailboxThread.vue
+++ b/src/components/MailboxThread.vue
@@ -36,7 +36,7 @@
 							<SectionTitle
 								class="section-title"
 								:name="t('mail', 'Favorites')" />
-							<Popover trigger="hover focus">
+							<NcPopover trigger="hover focus">
 								<template #trigger>
 									<ButtonVue
 										type="tertiary-no-background"
@@ -50,7 +50,7 @@
 								<p class="section-header-info">
 									{{ favoritesInfo }}
 								</p>
-							</Popover>
+							</NcPopover>
 						</div>
 						<Mailbox
 							v-show="hasFavoriteEnvelopes"
@@ -81,7 +81,7 @@
 							<SectionTitle
 								class="section-title"
 								:name="t('mail', 'Favorites')" />
-							<Popover trigger="hover focus">
+							<NcPopover trigger="hover focus">
 								<template #trigger>
 									<ButtonVue
 										type="tertiary-no-background"
@@ -95,7 +95,7 @@
 								<p class="section-header-info">
 									{{ favoritesInfo }}
 								</p>
-							</Popover>
+							</NcPopover>
 						</div>
 						<Mailbox
 							v-show="hasFavoriteEnvelopes"
@@ -114,7 +114,7 @@
 							<SectionTitle
 								class="section-title"
 								:name="t('mail', 'Follow up')" />
-							<Popover trigger="hover focus">
+							<NcPopover trigger="hover focus">
 								<template #trigger>
 									<ButtonVue
 										type="tertiary-no-background"
@@ -128,7 +128,7 @@
 								<p class="section-header-info">
 									{{ followupInfo }}
 								</p>
-							</Popover>
+							</NcPopover>
 						</div>
 						<Mailbox
 							v-show="hasFollowUpEnvelopes"
@@ -145,7 +145,7 @@
 							<SectionTitle
 								class="section-title important"
 								:name="t('mail', 'Important')" />
-							<Popover trigger="hover focus">
+							<NcPopover trigger="hover focus">
 								<template #trigger>
 									<ButtonVue
 										type="tertiary-no-background"
@@ -159,7 +159,7 @@
 								<p class="section-header-info">
 									{{ importantInfo }}
 								</p>
-							</Popover>
+							</NcPopover>
 						</div>
 						<Mailbox
 							v-show="hasImportantEnvelopes"
@@ -196,7 +196,7 @@
 </template>
 
 <script>
-import { NcAppContent as AppContent, NcAppContentList as AppContentList, NcButton as ButtonVue, isMobile, NcPopover as Popover } from '@nextcloud/vue'
+import { NcAppContent as AppContent, NcAppContentList as AppContentList, NcButton as ButtonVue, isMobile, NcPopover } from '@nextcloud/vue'
 import addressParser from 'address-rfc2822'
 import mitt from 'mitt'
 import { mapStores } from 'pinia'
@@ -237,7 +237,7 @@ export default {
 		IconInfo,
 		Mailbox,
 		NoMessageSelected,
-		Popover,
+		NcPopover,
 		SectionTitle,
 		SearchMessages,
 		Thread,
diff --git a/src/components/RecipientBubble.vue b/src/components/RecipientBubble.vue
index c290f32bfb..50dcdfc1d8 100644
--- a/src/components/RecipientBubble.vue
+++ b/src/components/RecipientBubble.vue
@@ -4,7 +4,7 @@
 -->
 
 <template>
-	<Popover popup-role="dialog" class="contact-popover">
+	<NcPopover popup-role="dialog" class="contact-popover">
 		<template #trigger="{ attrs }">
 			<UserBubble
 				v-bind="attrs"
@@ -109,13 +109,13 @@
 				</div>
 			</div>
 		</template>
-	</Popover>
+	</NcPopover>
 </template>
 
 <script>
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { generateUrl } from '@nextcloud/router'
-import { NcButton as ButtonVue, NcSelect, NcPopover as Popover, NcUserBubble as UserBubble } from '@nextcloud/vue'
+import { NcButton as ButtonVue, NcPopover, NcSelect, NcUserBubble as UserBubble } from '@nextcloud/vue'
 import debouncePromise from 'debounce-promise'
 import uniqBy from 'lodash/fp/uniqBy.js'
 import IconUser from 'vue-material-design-icons/AccountOutline.vue'
@@ -137,7 +137,7 @@ export default {
 	components: {
 		ButtonVue,
 		UserBubble,
-		Popover,
+		NcPopover,
 		NcSelect,
 		IconReply,
 		IconUser,
diff --git a/src/components/Thread.vue b/src/components/Thread.vue
index f05f42b947..7e2e89ef8a 100644
--- a/src/components/Thread.vue
+++ b/src/components/Thread.vue
@@ -24,7 +24,7 @@
 							:email="participant.email"
 							:label="participant.label" />
 						<!-- Indicator to show that there are more participants than displayed -->
-						<Popover
+						<NcPopover
 							v-if="threadParticipants.length > participantsToDisplay"
 							class="avatar-more">
 							<template #trigger="{ attrs }">
@@ -40,7 +40,7 @@
 								:title="participant.email"
 								:email="participant.email"
 								:label="participant.label" />
-						</Popover>
+						</NcPopover>
 						<!-- Remaining participants, if any (Needed to have avatarHeader reactive) -->
 						<RecipientBubble
 							v-for="participant in threadParticipants.slice(participantsToDisplay)"
@@ -74,7 +74,7 @@
 import { showError } from '@nextcloud/dialogs'
 import { loadState } from '@nextcloud/initial-state'
 import moment from '@nextcloud/moment'
-import { NcAppContentDetails as AppContentDetails, NcPopover as Popover } from '@nextcloud/vue'
+import { NcAppContentDetails as AppContentDetails, NcPopover } from '@nextcloud/vue'
 import debounce from 'lodash/fp/debounce.js'
 import { mapStores } from 'pinia'
 import { prop, uniqBy } from 'ramda'
@@ -97,7 +97,7 @@ export default {
 		Error,
 		Loading,
 		ThreadEnvelope,
-		Popover,
+		NcPopover,
 	},
 
 	props: {