diff --git a/src/components/mailFilter/Action.vue b/src/components/mailFilter/Action.vue
index af7a46bb39..a5c093f759 100644
--- a/src/components/mailFilter/Action.vue
+++ b/src/components/mailFilter/Action.vue
@@ -34,6 +34,7 @@
 <script>
 import ActionFileinto from './ActionFileinto.vue'
 import ActionAddflag from './ActionAddflag.vue'
+import ActionStop from './ActionStop.vue'
 import { NcButton, NcSelect, NcTextField } from '@nextcloud/vue'
 import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 
@@ -45,6 +46,7 @@ export default {
 		NcButton,
 		ActionFileinto,
 		ActionAddflag,
+		ActionStop,
 		DeleteIcon,
 	},
 	props: {
@@ -62,7 +64,6 @@ export default {
 			availableTypes: [
 				'addflag',
 				'fileinto',
-				'keep',
 				'stop',
 			],
 		}
@@ -73,6 +74,8 @@ export default {
 				return ActionFileinto
 			} else if (this.action.type === 'addflag') {
 				return ActionAddflag
+			} else if (this.action.type === 'stop') {
+				return ActionStop
 			}
 			return null
 		},
diff --git a/src/components/mailFilter/ActionAddflag.vue b/src/components/mailFilter/ActionAddflag.vue
index 373b52d459..961f512cf4 100644
--- a/src/components/mailFilter/ActionAddflag.vue
+++ b/src/components/mailFilter/ActionAddflag.vue
@@ -3,8 +3,7 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<NcTextField id="mail-filter-value"
-		:required="true"
+	<NcTextField :required="true"
 		:label="t('mail', 'Flag')"
 		:value="flag"
 		@update:value="onInput" />
@@ -39,3 +38,8 @@ export default {
 	},
 }
 </script>
+<style lang="scss" scoped>
+.input-field {
+	min-width: 260px;
+}
+</style>
diff --git a/src/components/mailFilter/ActionFileinto.vue b/src/components/mailFilter/ActionFileinto.vue
index c0c9ed266a..4ea61da394 100644
--- a/src/components/mailFilter/ActionFileinto.vue
+++ b/src/components/mailFilter/ActionFileinto.vue
@@ -6,6 +6,7 @@
 	<NcSelect ref="select"
 		:value="mailbox"
 		:options="mailboxes"
+		:required="true"
 		@input="onInput" />
 </template>
 <script>
diff --git a/src/components/mailFilter/ActionStop.vue b/src/components/mailFilter/ActionStop.vue
new file mode 100644
index 0000000000..6d7184fd6d
--- /dev/null
+++ b/src/components/mailFilter/ActionStop.vue
@@ -0,0 +1,23 @@
+<!--
+  - SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<template>
+	<p>{{ t('mail', 'The stop action ends all processing') }}</p>
+</template>
+<script>
+
+export default {
+	name: 'ActionStop',
+	props: {
+		action: {
+			type: Object,
+			required: true,
+		},
+		account: {
+			type: Object,
+			required: true,
+		},
+	},
+}
+</script>
diff --git a/src/components/mailFilter/Test.vue b/src/components/mailFilter/Test.vue
index 5f81e123bf..0b03d379a6 100644
--- a/src/components/mailFilter/Test.vue
+++ b/src/components/mailFilter/Test.vue
@@ -6,8 +6,7 @@
 	<div class="mail-filter-rows">
 		<div class="mail-filter-rows__row">
 			<div class="mail-filter-rows__row__column">
-				<NcSelect id="mail-filter-field"
-					input-label="field"
+				<NcSelect input-label="field"
 					:value="test.field"
 					:required="true"
 					:label-outside="true"
@@ -34,14 +33,14 @@
 			</div>
 		</div>
 		<div class="mail-filter-rows__row">
-			<NcSelect id="mail-filter-value"
-				v-model="localValues"
+			<NcSelect v-model="localValues"
 				input-label="value"
 				class="mail-filter-rows__row__select"
 				:multiple="true"
 				:wrap="true"
 				:close-on-select="false"
 				:taggable="true"
+				:required="true"
 				@option:selected="updateTest({ values: localValues })"
 				@option:deselected="updateTest({ values: localValues })" />
 		</div>