diff --git a/src/components/MailboxInlinePicker.vue b/src/components/MailboxInlinePicker.vue
index 30e6e8b1af..da4394b23f 100644
--- a/src/components/MailboxInlinePicker.vue
+++ b/src/components/MailboxInlinePicker.vue
@@ -92,6 +92,7 @@ export default {
 input.vue-treeselect__input {
 	margin: 0;
 	padding: 0;
+	border: 1px solid var(--color-border-maxcontrast) !important;
 }
 .vue-treeselect__menu {
 	background: var(--color-main-background);
diff --git a/src/components/mailFilter/Action.vue b/src/components/mailFilter/Action.vue
index 7f5754d780..9853114a4e 100644
--- a/src/components/mailFilter/Action.vue
+++ b/src/components/mailFilter/Action.vue
@@ -93,6 +93,5 @@ export default {
 .mail-filter-row {
 	display: flex;
 	gap: 5px;
-	align-items: baseline;
 }
 </style>
diff --git a/src/components/mailFilter/ActionFileinto.vue b/src/components/mailFilter/ActionFileinto.vue
index 3c5a57813c..a5614c4b8f 100644
--- a/src/components/mailFilter/ActionFileinto.vue
+++ b/src/components/mailFilter/ActionFileinto.vue
@@ -3,23 +3,19 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<NcSelect ref="select"
-		:value="mailbox"
-		:options="mailboxes"
-		:required="true"
-		@input="onInput" />
+	<MailboxInlinePicker v-model="selectedMailbox" :account="account" />
 </template>
 <script>
 
-import NcSelect from '@nextcloud/vue/components/NcSelect'
-import { mailboxHasRights } from '../../util/acl.js'
 import { mapStores } from 'pinia'
 import useMainStore from '../../store/mainStore.js'
+import MailboxInlinePicker from '../MailboxInlinePicker.vue'
+import logger from '../../logger.js'
 
 export default {
 	name: 'ActionFileinto',
 	components: {
-		NcSelect,
+		MailboxInlinePicker,
 	},
 	props: {
 		action: {
@@ -31,18 +27,24 @@ export default {
 			required: true,
 		},
 	},
+	data() {
+		return {
+			currentSelectedMailboxId: null,
+		}
+	},
 	computed: {
 		...mapStores(useMainStore),
 		mailbox() {
 			return this.action.mailbox ?? undefined
 		},
-		mailboxes() {
-			const mailboxes = this.mainStore.getMailboxes(this.account.accountId)
-				.filter(mailbox => mailboxHasRights(mailbox, 'i'))
-
-			return mailboxes.map((mailbox) => {
-				return mailbox.displayName
-			})
+		selectedMailbox: {
+			get() {
+				return this.currentSelectedMailboxId
+			},
+			set(selectedMailboxId) {
+				logger.debug('Selected mailbox set to', selectedMailboxId)
+				this.currentSelectedMailboxId = selectedMailboxId
+			},
 		},
 	},
 	methods: {