diff --git a/src/components/AccountSettings.vue b/src/components/AccountSettings.vue
index 99ba51f556..0487bcdfff 100644
--- a/src/components/AccountSettings.vue
+++ b/src/components/AccountSettings.vue
@@ -13,27 +13,29 @@
 		@update:open="onClose">
 		<NcAppSettingsSection
 			id="alias-settings"
+			key="alias-settings"
 			:name="t('mail', 'Aliases')">
 			<AliasSettings :account="account" @rename-primary-alias="scrollToAccountSettings" />
 		</NcAppSettingsSection>
 		<NcAppSettingsSection
 			id="certificate-settings"
+			key="certificate-settings"
 			:name="t('mail', 'Alias to S/MIME certificate mapping')">
 			<CertificateSettings :account="account" />
 		</NcAppSettingsSection>
-		<NcAppSettingsSection id="writing-mode" :name="t('mail', 'Writing mode')">
+		<NcAppSettingsSection id="writing-mode" key="writing-mode" :name="t('mail', 'Writing mode')">
 			<p class="settings-hint">
 				{{ t('mail', 'Preferred writing mode for new messages and replies.') }}
 			</p>
 			<EditorSettings :account="account" />
 		</NcAppSettingsSection>
-		<NcAppSettingsSection id="signature" :name="t('mail', 'Signature')">
+		<NcAppSettingsSection id="signature" key="signature" :name="t('mail', 'Signature')">
 			<p class="settings-hint">
 				{{ t('mail', 'A signature is added to the text of new messages and replies.') }}
 			</p>
 			<SignatureSettings :account="account" />
 		</NcAppSettingsSection>
-		<NcAppSettingsSection id="default-folders" :name=" t('mail', 'Default folders')">
+		<NcAppSettingsSection id="default-folders" key="default-folders" :name=" t('mail', 'Default folders')">
 			<p class="settings-hint">
 				{{
 					t('mail', 'The folders to use for drafts, sent messages, deleted messages, archived messages and junk messages.')
@@ -41,7 +43,7 @@
 			</p>
 			<AccountDefaultsSettings :account="account" />
 		</NcAppSettingsSection>
-		<NcAppSettingsSection id="trash-retention" :name=" t('mail', 'Automatic trash deletion')">
+		<NcAppSettingsSection id="trash-retention" key="trash-retention" :name=" t('mail', 'Automatic trash deletion')">
 			<p class="settings-hint">
 				{{ t('mail', 'Days after which messages in Trash will automatically be deleted:') }}
 			</p>
@@ -50,27 +52,25 @@
 		<NcAppSettingsSection
 			v-if="account"
 			id="out-of-office-replies"
+			key="out-of-office-replies"
 			:name="t('mail', 'Autoresponder')">
 			<p class="settings-hint">
 				{{ t('mail', 'Automated reply to incoming messages. If someone sends you several messages, this automated reply will be sent at most once every 4 days.') }}
 			</p>
 			<OutOfOfficeForm v-if="account.sieveEnabled" :account="account" />
-			<div v-else>
-				<p>{{ t('mail', 'The autoresponder uses Sieve, a scripting language supported by many email providers. If you\'re unsure whether yours does, check with your provider. If Sieve is available, click the button to go to the settings and enable it.') }}</p>
-				<NcButton variant="secondary" :aria-label="t('mail', 'Go to Sieve settings')" href="#sieve-form">
-					{{ t('mail', 'Go to Sieve settings') }}
-				</NcButton>
-			</div>
+			<SieveDisabledHint v-else />
 		</NcAppSettingsSection>
 		<NcAppSettingsSection
 			v-if="account && systemVersion >= 33"
 			id="calendar-settings"
+			key="calendar-settings"
 			:name="t('mail', 'Calendar settings')">
 			<CalendarSettings :account="account" />
 		</NcAppSettingsSection>
 		<NcAppSettingsSection
 			v-if="account"
 			id="classification"
+			key="classification"
 			:name="t('mail', 'Classification settings')">
 			<NcCheckboxRadioSwitch
 				id="auto-classification-enabled"
@@ -80,34 +80,34 @@
 				{{ t('mail', 'Enable mark as important classification') }}
 			</NcCheckboxRadioSwitch>
 		</NcAppSettingsSection>
-		<NcAppSettingsSection
-			v-if="account && account.sieveEnabled"
-			id="mail-filters"
-			:name="t('mail', 'Filters')">
-			<div id="mail-filters">
-				<MailFilters :key="account.accountId" ref="mailFilters" :account="account" />
-			</div>
+		<!-- TRANSLATORS: Settings for searching in a folder -->
+		<NcAppSettingsSection id="mailbox_search" key="mailbox_search" :name="t('mail', 'Folder search')">
+			<SearchSettings :account="account" />
 		</NcAppSettingsSection>
 		<NcAppSettingsSection
 			v-if="account"
 			id="quick-actions-settings"
+			key="quick-actions-settings"
 			:name="t('mail', 'Quick actions')">
 			<Settings :key="account.accountId" ref="quickActions" :account="account" />
 		</NcAppSettingsSection>
 		<NcAppSettingsSection
-			v-if="account && account.sieveEnabled"
-			id="sieve-filter"
-			:name="t('mail', 'Sieve script editor')">
-			<div id="sieve-filter">
-				<SieveFilterForm
-					:key="account.accountId"
-					ref="sieveFilterForm"
-					:account="account" />
+			v-if="account"
+			id="mail-filters"
+			key="mail-filters"
+			:name="t('mail', 'Filters')">
+			<p class="settings-hint">
+				{{ t('mail', 'Rules that are applied to incoming messages, for example to move them into a folder or flag them.') }}
+			</p>
+			<div v-if="account.sieveEnabled" id="mail-filters">
+				<MailFilters :key="account.accountId" ref="mailFilters" :account="account" />
 			</div>
+			<SieveDisabledHint v-else />
 		</NcAppSettingsSection>
 		<NcAppSettingsSection
 			v-if="account && !account.provisioningId && !account.isDelegated"
 			id="mail-server"
+			key="mail-server"
 			ref="mail-server"
 			:name="t('mail', 'Mail server')">
 			<div id="mail-settings">
@@ -122,6 +122,7 @@
 		<NcAppSettingsSection
 			v-if="account && !account.provisioningId"
 			id="sieve-settings"
+			key="sieve-settings"
 			:name="t('mail', 'Sieve server')">
 			<div id="sieve-settings">
 				<SieveAccountForm
@@ -130,15 +131,23 @@
 					:account="account" />
 			</div>
 		</NcAppSettingsSection>
-		<!-- TRANSLATORS: Settings for searching in a folder -->
-		<NcAppSettingsSection id="mailbox_search" :name="t('mail', 'Folder search')">
-			<SearchSettings :account="account" />
+		<NcAppSettingsSection
+			v-if="account && account.sieveEnabled"
+			id="sieve-filter"
+			key="sieve-filter"
+			:name="t('mail', 'Sieve script editor')">
+			<div id="sieve-filter">
+				<SieveFilterForm
+					:key="account.accountId"
+					ref="sieveFilterForm"
+					:account="account" />
+			</div>
 		</NcAppSettingsSection>
 	</NcAppSettingsDialog>
 </template>
 
 <script>
-import { NcAppSettingsDialog, NcAppSettingsSection, NcButton, NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcAppSettingsDialog, NcAppSettingsSection, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import { mapStores } from 'pinia'
 import AccountDefaultsSettings from '../components/AccountDefaultsSettings.vue'
 import AccountForm from '../components/AccountForm.vue'
@@ -152,6 +161,7 @@ import OutOfOfficeForm from './OutOfOfficeForm.vue'
 import Settings from './quickActions/Settings.vue'
 import SearchSettings from './SearchSettings.vue'
 import SieveAccountForm from './SieveAccountForm.vue'
+import SieveDisabledHint from './SieveDisabledHint.vue'
 import SieveFilterForm from './SieveFilterForm.vue'
 import TrashRetentionSettings from './TrashRetentionSettings.vue'
 import logger from '../logger.js'
@@ -161,6 +171,7 @@ export default {
 	name: 'AccountSettings',
 	components: {
 		SieveAccountForm,
+		SieveDisabledHint,
 		SieveFilterForm,
 		AccountForm,
 		AliasSettings,
@@ -175,7 +186,6 @@ export default {
 		TrashRetentionSettings,
 		SearchSettings,
 		MailFilters,
-		NcButton,
 		Settings,
 		NcCheckboxRadioSwitch,
 	},
diff --git a/src/components/SieveDisabledHint.vue b/src/components/SieveDisabledHint.vue
new file mode 100644
index 0000000000..d3f28dd0af
--- /dev/null
+++ b/src/components/SieveDisabledHint.vue
@@ -0,0 +1,27 @@
+<!--
+  - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+<template>
+	<NcNoteCard type="info">
+		<!-- TRANSLATORS: Shown inside a settings section whose feature is unavailable; "this feature" is the one the section configures -->
+		<p>{{ t('mail', 'This feature needs Sieve, a scripting language supported by many email providers. If you\'re unsure whether yours does, check with your provider. If Sieve is available, click the button to go to the settings and enable it.') }}</p>
+		<NcButton variant="secondary" :aria-label="t('mail', 'Go to Sieve settings')" href="#sieve-form">
+			{{ t('mail', 'Go to Sieve settings') }}
+		</NcButton>
+	</NcNoteCard>
+</template>
+
+<script>
+import { NcButton, NcNoteCard } from '@nextcloud/vue'
+
+export default {
+	name: 'SieveDisabledHint',
+
+	components: {
+		NcButton,
+		NcNoteCard,
+	},
+}
+</script>
diff --git a/src/components/mailFilter/MailFilters.vue b/src/components/mailFilter/MailFilters.vue
index 9a5b20eee1..75c88b37a0 100644
--- a/src/components/mailFilter/MailFilters.vue
+++ b/src/components/mailFilter/MailFilters.vue
@@ -4,7 +4,6 @@
 -->
 <template>
 	<div class="section">
-		<p>{{ t('mail', 'Take control of your email chaos. Filters help you to prioritize what matters and eliminate clutter.') }}</p>
 		<div v-if="loading" class="filter-list__loading">
 			<NcLoadingIcon />
 			<p>{{ t('mail', 'Hang tight while the filters load') }}</p>