diff --git a/dashboard/src/components/CatchAllSettingsItem.vue b/dashboard/src/components/CatchAllSettingsItem.vue
new file mode 100644
index 000000000..491df5899
--- /dev/null
+++ b/dashboard/src/components/CatchAllSettingsItem.vue
@@ -0,0 +1,81 @@
+<script setup>
+
+import { ref, onMounted, computed } from 'vue';
+import { MultiSelect, InputGroup, Button, FormGroup } from 'pankow';
+import SettingsItem from './SettingsItem.vue';
+import DomainsModel from '../models/DomainsModel.js';
+import MailModel from '../models/MailModel.js';
+
+const props = defineProps([ 'domainConfig' ]);
+
+const domainsModel = DomainsModel.create();
+const mailModel = MailModel.create();
+
+const busy = ref(true);
+const addresses = ref([]);
+const currentAddresses = ref([]);
+const allAddresses = ref([]);
+
+async function onSubmit() {
+  busy.value = true;
+
+  const [error] = await mailModel.setCatchallAddresses(props.domainConfig.domain, addresses.value);
+  if (error) return console.error(error);
+
+  currentAddresses.value = addresses.value.slice();
+  busy.value = false;
+}
+
+const hasChanged = computed(() => {
+  if (currentAddresses.value.length !== addresses.value.length) return true;
+
+  const currentSorted = currentAddresses.value.toSorted();
+  const selectedSorted = addresses.value.toSorted();
+
+  for (let i = 0; i < currentSorted.length; i++) {
+    if (currentSorted[i] !== selectedSorted[i]) return true;
+  }
+
+  return false;
+});
+
+onMounted(async () => {
+  const [error, result] = await domainsModel.list();
+  if (error) return console.error(error);
+
+  // only for inbound enabled but then we have extra rest calls
+
+  for (const domain of result) {
+    const [error, result] = await mailModel.listMailboxes(domain.domain);
+    if (error) return console.error(error);
+
+    allAddresses.value = allAddresses.value.concat(result.map(mailbox => {
+      return {
+        id: `${mailbox.name}@${mailbox.domain}`,
+        label: `${mailbox.name}@${mailbox.domain}`,
+      };
+    }));
+  }
+
+  addresses.value = props.domainConfig.catchAll.slice();
+  currentAddresses.value = props.domainConfig.catchAll.slice();
+
+  busy.value = false;
+});
+
+</script>
+
+<template>
+  <SettingsItem>
+    <FormGroup>
+      <label>{{ $t('email.incoming.catchall.title') }}</label>
+      <div v-html="$t('email.incoming.catchall.description')"></div>
+    </FormGroup>
+    <div style="display: flex; gap: 6px; align-items: center;">
+      <InputGroup>
+        <MultiSelect v-model="addresses" :options="allAddresses" option-label="label" option-key="id" />
+        <Button @click="onSubmit()" :disabled="busy || !hasChanged" :loading="busy">{{ $t('email.incoming.catchall.saveAction') }}</Button>
+      </InputGroup>
+    </div>
+  </SettingsItem>
+</template>
diff --git a/dashboard/src/models/MailModel.js b/dashboard/src/models/MailModel.js
index c8acc250a..cef785054 100644
--- a/dashboard/src/models/MailModel.js
+++ b/dashboard/src/models/MailModel.js
@@ -39,6 +39,39 @@ function create() {
       if (result.status !== 200) return [result];
       return [null, result.body.count];
     },
+    async listMailboxes(domain, search = '', page = 1, per_page = 1000) {
+      let result;
+      try {
+        result = await fetcher.get(`${API_ORIGIN}/api/v1/mail/${domain}/mailboxes`, { search, page, per_page, access_token: accessToken });
+      } catch (e) {
+        return [e];
+      }
+
+      if (result.status !== 200) return [result];
+      return [null, result.body.mailboxes];
+    },
+    async getMailbox(domain, mailboxName) {
+      let result;
+      try {
+        result = await fetcher.get(`${API_ORIGIN}/api/v1/mail/${domain}/mailboxes/${mailboxName}`, { access_token: accessToken });
+      } catch (e) {
+        return [e];
+      }
+
+      if (result.status !== 200) return [result];
+      return [null, result.body.mailbox];
+    },
+    async setCatchallAddresses(domain, addresses) {
+      let result;
+      try {
+        result = await fetcher.post(`${API_ORIGIN}/api/v1/mail/${domain}/catch_all`, { addresses }, { access_token: accessToken });
+      } catch (e) {
+        return [e];
+      }
+
+      if (result.status !== 202) return [result];
+      return [null];
+    },
     async setEnabled(domain, enabled) {
       let result;
       try {
diff --git a/dashboard/src/views/EmailDomainView.vue b/dashboard/src/views/EmailDomainView.vue
index a28c9d09b..4ad90d5b8 100644
--- a/dashboard/src/views/EmailDomainView.vue
+++ b/dashboard/src/views/EmailDomainView.vue
@@ -8,6 +8,7 @@ import { ref, onMounted, useTemplateRef } from 'vue';
 import { Button, TableView, Checkbox, InputDialog, Dialog, FormGroup, TextInput, InputGroup, Switch, ButtonGroup, SingleSelect } from 'pankow';
 import Section from '../components/Section.vue';
 import SettingsItem from '../components/SettingsItem.vue';
+import CatchAllSettingsItem from '../components/CatchAllSettingsItem.vue';
 import DomainsModel from '../models/DomainsModel.js';
 import MailModel from '../models/MailModel.js';
 import ProfileModel from '../models/ProfileModel.js';
@@ -38,7 +39,6 @@ async function onAskIncomingToggle(value) {
   const yes = await inputDialog.value.confirm({
     title: t('email.disableEmailDialog.title', { domain: domain.value }),
     message: t('email.disableEmailDialog.description', { domain: domain.value }),
-    modal: true,
     confirmStyle: 'danger',
     confirmLabel: t('email.disableEmailDialog.disableAction'),
     rejectLabel: t('main.dialog.cancel'),
@@ -117,6 +117,7 @@ onMounted(async () => {
       :reject-label="enableIncomeBusy ? '' : $t('main.dialog.cancel')"
        reject-style="secondary"
       @confirm="onEnableIncoming()"
+      @reject="incomingEnabled = false"
     >
       <div>
         <p v-html="$t('email.enableEmailDialog.description', { domain: domain, requiredPortsDocsLink: 'https://docs.cloudron.io/email/#required-ports' })"></p>
@@ -149,6 +150,8 @@ onMounted(async () => {
         </FormGroup>
         <Switch v-model="mailFromValidation" @change="onToggleMailFromValidation"/>
       </SettingsItem>
+
+      <CatchAllSettingsItem :domain-config="mailConfig" />
     </Section>
   </div>
 </template>