diff --git a/dashboard/public/translation/da.json b/dashboard/public/translation/da.json
index 8f899ae8b..ef4abdcf4 100644
--- a/dashboard/public/translation/da.json
+++ b/dashboard/public/translation/da.json
@@ -876,7 +876,6 @@
         },
         "enableEmailDialog": {
             "description": "Dette vil konfigurere Cloudron til at modtage e-mails for<b>{{ domain }}</b>Se dokumentationen for åbning af de <a href=\"{{{ requiredPortsDocsLink }}\" target=\"_blank\">forpligtede porte</a> for Cloudron Email.",
-            "cloudflareInfo": "Mailserverens domæne <code>{{ adminDomain }}</code> administreres af Cloudflare. Kontrollér, at Cloudflare-proxy er deaktiveret for <code>{{ mailFqdn }}</code> og indstillet til <code>kun DNS</code>. Dette er nødvendigt, fordi Cloudflare ikke proxy'er e-mail.",
             "title": "Aktiver e-mail for {{ domain }}?",
             "noProviderInfo": "Der er ikke oprettet nogen DNS-udbyder. De DNS-poster, der er anført i fanen Status, skal oprettes manuelt.",
             "setupDnsCheckbox": "Opsæt Mail DNS-poster nu",
diff --git a/dashboard/public/translation/de.json b/dashboard/public/translation/de.json
index 4cf966b71..69e4bcd68 100644
--- a/dashboard/public/translation/de.json
+++ b/dashboard/public/translation/de.json
@@ -929,7 +929,6 @@
         "enableEmailDialog": {
             "description": "Dies wird Cloudron so konfigurieren, dass E-Mails für <b>{{ domain }}</b> empfangen werden. Die Dokumentation zum Öffnen der <a href=\"{{ requiredPortsDocsLink }}\" target=\"_blank\">erforderlichen Ports</a> für Cloudron E-Mail lesen.",
             "noProviderInfo": "Es ist kein DNS-Anbieter eingerichtet. Die in der Registerkarte Status aufgeführten DNS-Einträge müssen manuell eingerichtet werden.",
-            "cloudflareInfo": "Die E-Mail Domäne <code>{{ adminDomain }}</code> wird von Cloudflare verwaltet. Sicherstellen, dass das Cloudflare-Proxying für <code>{{ mailFqdn }}</code> deaktiviert und auf <code>DNS only</code> gesetzt ist. Dies ist erforderlich, da Cloudflare kein E-Mail-Proxying durchführt.",
             "enableAction": "Aktivieren",
             "title": "E-Mail für {{ domain }} aktivieren?",
             "setupDnsCheckbox": "DNS-Einträge für E-Mail jetzt einrichten",
diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json
index 485f0ffeb..cad089f41 100644
--- a/dashboard/public/translation/en.json
+++ b/dashboard/public/translation/en.json
@@ -1063,17 +1063,16 @@
             "rblCheck": "DNS Blacklist Check"
         },
         "enableEmailDialog": {
-            "title": "Enable Email for {{ domain }}?",
-            "description": "This will configure Cloudron to receive emails for <b>{{ domain }}</b>. See the documentation for opening up the <a href=\"{{ requiredPortsDocsLink }}\" target=\"_blank\">required ports</a> for Cloudron Email.",
+            "title": "Enable Incoming Email",
+            "description": "Cloudron will start receiving email for \"{{ domain }}\". See the documentation for the  <a href=\"{{ requiredPortsDocsLink }}\" target=\"_blank\">required ports</a>.",
             "noProviderInfo": "No DNS provider is set up. The DNS records listed in the Status tab have to be set up manually.",
-            "cloudflareInfo": "The mail server's domain <code>{{ adminDomain }}</code> is managed by Cloudflare. Please verify that Cloudflare proxying is disabled for <code>{{ mailFqdn }}</code> and set to <code>DNS only</code>. This is required because Cloudflare does not proxy email.",
             "setupDnsCheckbox": "Set up Mail DNS records now",
-            "setupDnsInfo": "Use this option to automatically set up Email related DNS records. Leaving this option unchecked is useful for creating mail boxes and <a href=\"{{ importEmailDocsLink }}\">importing email</a> before going live.",
+            "setupDnsInfo": "Automatically set up mail DNS records. You can also <a href=\"/#/domains\">sync DNS</a> later if you need to  <a href=\"{{ importEmailDocsLink }}\">import</a> mailboxes first.",
             "enableAction": "Enable"
         },
         "disableEmailDialog": {
-            "title": "Disable Email Server for {{ domain }}?",
-            "description": "This will configure Cloudron to stop receiving emails for <b>{{ domain }}</b>. Mailboxes and lists associated with this domain will not be deleted.",
+            "title": "Disable Incoming Email",
+            "description": "Cloudron will stop receiving emails for \"{{ domain }}\". Mailboxes and mailing lists on this domain will not be deleted.",
             "disableAction": "Disable"
         },
         "addMailboxDialog": {
diff --git a/dashboard/public/translation/es.json b/dashboard/public/translation/es.json
index dd7967b59..6f357137d 100644
--- a/dashboard/public/translation/es.json
+++ b/dashboard/public/translation/es.json
@@ -1362,8 +1362,7 @@
             "setupDnsInfo": "Utiliza esta opción para configurar automáticamente los registros DNS relacionados con el correo electrónico. Dejar esta opción sin marcar es útil para crear buzones de correo e <a href=\"{{ importEmailDocsLink }}\"> importar correo electrónico </a> antes de publicarlo.",
             "title": "¿Habilitar el correo electrónico para {{ domain }}?",
             "setupDnsCheckbox": "Configura los registros DNS de correo ahora",
-            "enableAction": "Habilitar",
-            "cloudflareInfo": "El dominio del servidor de correo <code>{{ adminDomain }}</code> es administrado por Cloudflare. Verifica que el proxy de Cloudflare esté deshabilitado para <code>{{ mailFqdn }}</code> y configurado en <code>DNS only</code>. Esto es necesario porque Cloudflare no realiza proxy de correo electrónico."
+            "enableAction": "Habilitar"
         },
         "disableEmailDialog": {
             "description": "Esto configurará Cloudron para que deje de recibir correos electrónicos para <b> {{dominio}} </b>. Los buzones de correo y las listas asociadas con este dominio no se eliminarán.",
diff --git a/dashboard/public/translation/fr.json b/dashboard/public/translation/fr.json
index ccdded4d8..542aeffe0 100644
--- a/dashboard/public/translation/fr.json
+++ b/dashboard/public/translation/fr.json
@@ -948,7 +948,6 @@
         "enableEmailDialog": {
             "setupDnsInfo": "Utilisez cette option pour paramétrer automatiquement les enregistrements DNS pour la messagerie. Ne pas cocher cette option peut permettre de créer des adresses de messagerie et d’<a href=\"{{ importEmailDocsLink }}\">importer des emails</a> avant le déploiement.",
             "setupDnsCheckbox": "Paramétrer les enregistrements DNS pour la messagerie maintenant",
-            "cloudflareInfo": "Le domaine <code>{{ adminDomain }}</code> est géré par Cloudflare. Veuillez vérifier que la fonction proxy de Cloudflare est désactivée pour <code>{{ mailFqdn }}</code> et défini sur <code>DNS uniquement</code>. Cette mesure est nécessaire car Cloudflare ne propose pas de proxy de messagerie.",
             "noProviderInfo": "Aucun fournisseur de DNS n'est paramétré. Les enregistrements DNS listés dans l'onglet État doivent être paramétrés manuellement.",
             "description": "Cette action permettra à Cloudron de recevoir des emails pour <b>{{ domain }}</b>. Consultez la documentation pour ouvrir les <a href=\"{{ requiredPortsDocsLink }}\" target=\"_blank\">ports nécessaires</a> à la messagerie Cloudron.",
             "title": "Activer la messagerie pour {{ domain }} ?",
diff --git a/dashboard/public/translation/it.json b/dashboard/public/translation/it.json
index b9e267a36..09f36f9a1 100644
--- a/dashboard/public/translation/it.json
+++ b/dashboard/public/translation/it.json
@@ -382,7 +382,6 @@
             "noProviderInfo": "Il fornitore di DNS non è impostato. Devi impostare manualmente i record DNS elencati nel tab di stato.",
             "setupDnsCheckbox": "Imposta i record DNS",
             "description": "Il Cloudron verrà configurato per ricevere e-mail su <b>{{ domain }}</b>. Leggi la documentazione su come aprire le <a href=\"{{ requiredPortsDocsLink }}\" target=\"_blank\">porte richieste</a>.",
-            "cloudflareInfo": "Il dominio <code>{{ adminDomain }}</code> è gestito da Cloudflare. Verifica che il Cloudflare proxying sia disabilitato per <code>{{ mailFqdn }}</code> ed è impostato su <code>DNS only</code>. Questa impostazione è necessaria perchè Cloudflare non fa il proxy per le e-mail.",
             "enableAction": "Abilita",
             "setupDnsInfo": "Usa questa opzione per l'impostazione automatica dei record DNS this option to automatically setup Email related DNS records. Leaving this option unchecked is useful for creating mail boxes and <a href=\"{{ importEmailDocsLink }}\">importing email</a> before going live."
         },
diff --git a/dashboard/public/translation/nl.json b/dashboard/public/translation/nl.json
index 8cc947774..e11b09c9b 100644
--- a/dashboard/public/translation/nl.json
+++ b/dashboard/public/translation/nl.json
@@ -1380,8 +1380,7 @@
             "setupDnsCheckbox": "DNS records voor e-mail nu instellen",
             "setupDnsInfo": "Gebruik deze optie om automatisch e-mail gerelateerde DNS records in te stellen. Het nu niet inschakelen kan handig zijn om eerst e-mail boxen aan te maken en <a href=\"{{ importEmailDocsLink }}\">e-mails te importeren</a> voor ingebruikname.",
             "enableAction": "Inschakelen",
-            "description": "Hiermee wordt Cloudron zo geconfigureerd dat e-mails ontvangen worden voor <b>{{ domain }}</b>. In de documentatie staat beschreven welke <a href=\"{{ requiredPortsDocsLink }}\" target=\"_blank\">benodigde poorten</a> ingesteld dienen te worden voor Cloudron Email.",
-            "cloudflareInfo": "Het domein van de mailserver <code>{{ adminDomain }}</code> wordt beheerd door Cloudflare. Zorg ervoor dat Cloudflare proxying uitgeschakeld is voor <code>{{ mailFqdn }}</code> en ingesteld is op <code>DNS only</code>. Dit is noodzakelijk omdat Cloudflare geen e-mail-proxy kan uitvoeren."
+            "description": "Hiermee wordt Cloudron zo geconfigureerd dat e-mails ontvangen worden voor <b>{{ domain }}</b>. In de documentatie staat beschreven welke <a href=\"{{ requiredPortsDocsLink }}\" target=\"_blank\">benodigde poorten</a> ingesteld dienen te worden voor Cloudron Email."
         },
         "disableEmailDialog": {
             "title": "E-mail Server voor {{ domain }} uitschakelen?",
diff --git a/dashboard/public/translation/ru.json b/dashboard/public/translation/ru.json
index 44ece0e57..37beec49d 100644
--- a/dashboard/public/translation/ru.json
+++ b/dashboard/public/translation/ru.json
@@ -1305,7 +1305,6 @@
             "setupDnsCheckbox": "Установить почтовые DNS записи",
             "enableAction": "Включить",
             "description": "Данный параметр настроит Cloudron на получение писем для <b>{{ domain }}</b>. Рекомендуем ознакомиться с <a href=\"{{ requiredPortsDocsLink }}\" target=\"_blank\">документацией</a> для открытия необходимых почтовому серверу портов.",
-            "cloudflareInfo": "Почтовый домен <code>{{ adminDomain }}</code> управляется при помощи Cloudflare. Пожалуйста, удостоверьтесь, что проксирование для <code>{{ mailFqdn}}</code> отключено, и активен режим <code>только DNS</code>. Это необходимо, так как Cloudflare не проксирует электронную почту.",
             "setupDnsInfo": "Используйте данную опцию, чтобы автоматически настроить относящиеся к электронной почте записи DNS. Вы можете не отмечать её сразу, чтобы предварительно создать почтовые ящики и <a href=\"{{ importEmailDocsLink }}\">импортировать письма</a>."
         },
         "incoming": {
diff --git a/dashboard/public/translation/vi.json b/dashboard/public/translation/vi.json
index 2843031a7..72aca04de 100644
--- a/dashboard/public/translation/vi.json
+++ b/dashboard/public/translation/vi.json
@@ -461,7 +461,6 @@
             "enableAction": "Bật",
             "setupDnsInfo": "Sử dụng lựa chọn này để cài đặt những bản ghi có liên quan đến email. Để trống lựa chọn này sẽ hữu ích cho việc tạo ra các hộp thư và <a href=\"{{ importEmailDocsLink }}\">nhập dữ liệu các mail đã có sẵn</a> trước khi đưa vào sử dụng.",
             "setupDnsCheckbox": "Cài đặt các bản ghi DNS ngay",
-            "cloudflareInfo": "Tên miền cho mail server <code>{{ adminDomain }}</code> được quản lý bởi Cloudflare. Hãy nhớ tắt proxy qua Cloudflare cho <code>{{ mailFqdn }}</code> và chỉnh về chế độ <code>DNS only</code>. Cần làm vậy vì Cloudflare không proxy được email.",
             "noProviderInfo": "Chưa cài đặt nhà cung cấp DNS. Những bản ghi DNS trong phần Trạng thái cần được cài đặt thủ công.",
             "description": "Lựa chọn này sẽ cấu hình Cloudron để nhận mail cho <b>{{ domain }}</b>. Xem hướng dẫn để mở <a href=\"{{ requiredPortsDocsLink }}\" target=\"_blank\">những cổng cần thiết</a> cho Email Cloudron.",
             "title": "Bật chế độ email cho {{ domain }}?"
diff --git a/dashboard/public/translation/zh_Hans.json b/dashboard/public/translation/zh_Hans.json
index 31e9c96cc..c937c5ebd 100644
--- a/dashboard/public/translation/zh_Hans.json
+++ b/dashboard/public/translation/zh_Hans.json
@@ -785,7 +785,6 @@
             "description": "此配置会使 Cloudron 为 <b>{{ domain }}</b> 收取邮件。请参考文档以为 Cloudron Email 开放 <a href=\"{{ requiredPortsDocsLink }}\" target=\"_blank\">所需要的端口</a>。",
             "enableAction": "启用",
             "noProviderInfo": "没有配置 DNS 提供商。请手动设置状态标签页下列出的 DNS 记录。",
-            "cloudflareInfo": "域名 <code>{{ adminDomain }}</code> 由 Cloudflare 管理。请确认 <code>{{ mailFqdn }}</code> 的 Cloudflare 代理已经关闭，并且设置为 <code>DNS only</code>。因为 Cloudflare 不会代理 Email。",
             "setupDnsInfo": "使用此选项会自动设置 Email 相关的 DNS 记录。如果你需要在启用 Email 服务器之前创建邮箱、<a href=\"{{ importEmailDocsLink }}\">导入邮件</a>，请先不要选中这个选项。",
             "setupDnsCheckbox": "现在设置邮件 DNS 记录"
         },
diff --git a/dashboard/src/views/EmailDomainView.vue b/dashboard/src/views/EmailDomainView.vue
index 99985e745..20c07dbcc 100644
--- a/dashboard/src/views/EmailDomainView.vue
+++ b/dashboard/src/views/EmailDomainView.vue
@@ -75,7 +75,7 @@ async function onAskIncomingToggle(value) {
   }
 
   const yes = await inputDialog.value.confirm({
-    title: t('email.disableEmailDialog.title', { domain: domain.value }),
+    title: t('email.disableEmailDialog.title'),
     message: t('email.disableEmailDialog.description', { domain: domain.value }),
     confirmStyle: 'danger',
     confirmLabel: t('email.disableEmailDialog.disableAction'),
@@ -227,7 +227,7 @@ onMounted(async () => {
     </Dialog>
 
     <Dialog ref="enableIncomingDialog"
-      :title="$t('email.enableEmailDialog.title', { domain: domain })"
+      :title="$t('email.enableEmailDialog.title')"
       :confirm-label="$t('email.enableEmailDialog.enableAction')"
       :confirm-busy="enableIncomeBusy"
       :reject-label="$t('main.dialog.cancel')"
@@ -237,8 +237,7 @@ onMounted(async () => {
       @reject="inboundEnabled = false"
     >
       <div>
-        <p v-html="$t('email.enableEmailDialog.description', { domain: domain, requiredPortsDocsLink: 'https://docs.cloudron.io/email/#required-ports' })"></p>
-        <p class="text-danger" v-if="adminDomainProvider === 'cloudflare'" v-html="$t('email.enableEmailDialog.cloudflareInfo', { adminDomain, mailFqdn })"></p>
+        <p v-html="$t('email.enableEmailDialog.description', { domain: domain, requiredPortsDocsLink: 'https://docs.cloudron.io/email/#firewall' })"></p>
         <div v-if="domainProvider === 'noop' || domainProvider === 'manual'" v-html="$t('email.enableEmailDialog.noProviderInfo')"></div>
         <div v-else>
           <Checkbox v-model="enableIncomingSetupDns" :disabled="enableIncomeBusy" :label="$t('email.enableEmailDialog.setupDnsCheckbox')"/>