From 6d16c785c56ac67bc75818cbe5f1e9779838cbac Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Thu, 3 Sep 2026 18:45:53 +0000
Subject: [PATCH 1/4] refactor(settings): move folder search below
 classification

Assisted-by: ClaudeCode:claude-opus-5
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---
 src/components/AccountSettings.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/AccountSettings.vue b/src/components/AccountSettings.vue
index 99ba51f556..eb83ece161 100644
--- a/src/components/AccountSettings.vue
+++ b/src/components/AccountSettings.vue
@@ -80,6 +80,10 @@
 				{{ t('mail', 'Enable mark as important classification') }}
 			</NcCheckboxRadioSwitch>
 		</NcAppSettingsSection>
+		<!-- TRANSLATORS: Settings for searching in a folder -->
+		<NcAppSettingsSection id="mailbox_search" :name="t('mail', 'Folder search')">
+			<SearchSettings :account="account" />
+		</NcAppSettingsSection>
 		<NcAppSettingsSection
 			v-if="account && account.sieveEnabled"
 			id="mail-filters"
@@ -130,10 +134,6 @@
 					:account="account" />
 			</div>
 		</NcAppSettingsSection>
-		<!-- TRANSLATORS: Settings for searching in a folder -->
-		<NcAppSettingsSection id="mailbox_search" :name="t('mail', 'Folder search')">
-			<SearchSettings :account="account" />
-		</NcAppSettingsSection>
 	</NcAppSettingsDialog>
 </template>
 

From 58e37e0c82db0ade3f42431ea9855c22e664d806 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Thu, 3 Sep 2026 18:50:19 +0000
Subject: [PATCH 2/4] refactor(settings): move sieve script editor below sieve
 server

Assisted-by: ClaudeCode:claude-opus-5
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---
 src/components/AccountSettings.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/AccountSettings.vue b/src/components/AccountSettings.vue
index eb83ece161..e6733ca8ee 100644
--- a/src/components/AccountSettings.vue
+++ b/src/components/AccountSettings.vue
@@ -98,17 +98,6 @@
 			: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" />
-			</div>
-		</NcAppSettingsSection>
 		<NcAppSettingsSection
 			v-if="account && !account.provisioningId && !account.isDelegated"
 			id="mail-server"
@@ -134,6 +123,17 @@
 					:account="account" />
 			</div>
 		</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" />
+			</div>
+		</NcAppSettingsSection>
 	</NcAppSettingsDialog>
 </template>
 

From 7d04fe0b7085351cd8c1b5461ff73cb565b74a1b Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Thu, 3 Sep 2026 19:01:29 +0000
Subject: [PATCH 3/4] feat(settings): always show the filters section

Assisted-by: ClaudeCode:claude-opus-5
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---
 src/components/AccountSettings.vue        | 32 +++++++++++------------
 src/components/SieveDisabledHint.vue      | 27 +++++++++++++++++++
 src/components/mailFilter/MailFilters.vue |  1 -
 3 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100644 src/components/SieveDisabledHint.vue

diff --git a/src/components/AccountSettings.vue b/src/components/AccountSettings.vue
index e6733ca8ee..810204ce5c 100644
--- a/src/components/AccountSettings.vue
+++ b/src/components/AccountSettings.vue
@@ -55,12 +55,7 @@
 				{{ 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"
@@ -84,20 +79,24 @@
 		<NcAppSettingsSection id="mailbox_search" :name="t('mail', 'Folder search')">
 			<SearchSettings :account="account" />
 		</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>
-		</NcAppSettingsSection>
 		<NcAppSettingsSection
 			v-if="account"
 			id="quick-actions-settings"
 			:name="t('mail', 'Quick actions')">
 			<Settings :key="account.accountId" ref="quickActions" :account="account" />
 		</NcAppSettingsSection>
+		<NcAppSettingsSection
+			v-if="account"
+			id="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"
@@ -138,7 +137,7 @@
 </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 +151,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 +161,7 @@ export default {
 	name: 'AccountSettings',
 	components: {
 		SieveAccountForm,
+		SieveDisabledHint,
 		SieveFilterForm,
 		AccountForm,
 		AliasSettings,
@@ -175,7 +176,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>

From 36b78090aed1d82338954a39905f33b4b7854a43 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Thu, 3 Sep 2026 19:07:44 +0000
Subject: [PATCH 4/4] fix(settings): key the account settings sections

Fixes an issue introduced by
https://github.com/nextcloud/mail/pull/13510.

The account settings component is no longer destroyed, its content is
swapped instead, so all sections share one dialog registry. They were
unkeyed siblings of the same component type and Vue matched them
positionally, so a shift of the filters section could re-register an id
before its previous holder released it, throwing "Duplicate section id
found: quick-actions-settings".

Assisted-by: ClaudeCode:claude-opus-5
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---
 src/components/AccountSettings.vue | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/components/AccountSettings.vue b/src/components/AccountSettings.vue
index 810204ce5c..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,6 +52,7 @@
 		<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.') }}
@@ -60,12 +63,14 @@
 		<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"
@@ -76,18 +81,20 @@
 			</NcCheckboxRadioSwitch>
 		</NcAppSettingsSection>
 		<!-- TRANSLATORS: Settings for searching in a folder -->
-		<NcAppSettingsSection id="mailbox_search" :name="t('mail', 'Folder search')">
+		<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"
 			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.') }}
@@ -100,6 +107,7 @@
 		<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">
@@ -114,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
@@ -125,6 +134,7 @@
 		<NcAppSettingsSection
 			v-if="account && account.sieveEnabled"
 			id="sieve-filter"
+			key="sieve-filter"
 			:name="t('mail', 'Sieve script editor')">
 			<div id="sieve-filter">
 				<SieveFilterForm