diff --git a/src/addons.js b/src/addons.js
index a97fc0531..f1eb8820d 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -136,7 +136,7 @@ function initialize(callback) {
     certificates.getAdminCertificatePath(function (error, certFilePath, keyFilePath) {
         if (error) return callback(error);
 
-        shell.sudo('seutp_infra', [ SETUP_INFRA_CMD, paths.DATA_DIR, config.fqdn(), config.adminFqdn(), certFilePath, keyFilePath, settings.isIncomingMailEnabled() ], callback);
+        shell.sudo('seutp_infra', [ SETUP_INFRA_CMD, paths.DATA_DIR, config.fqdn(), config.adminFqdn(), certFilePath, keyFilePath ], callback);
     });
 }
 
diff --git a/src/cloudron.js b/src/cloudron.js
index cb795fe7b..0bb48459e 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -457,7 +457,7 @@ function addDnsRecords() {
         if (config.isCustomDomain()) {
             records.push(webadminRecord);
             records.push(dkimRecord);
-            if (settings.isIncomingMailEnabled()) records.push(mxRecord);
+            records.push(mxRecord);
         } else {
             // for custom domains, we show a nakeddomain.html page
             var nakedDomainRecord = { subdomain: '', type: 'A', values: [ ip ] };
@@ -466,7 +466,7 @@ function addDnsRecords() {
             records.push(webadminRecord);
             records.push(dkimRecord);
             records.push(dmarcRecord);
-            if (settings.isIncomingMailEnabled()) records.push(mxRecord);
+            records.push(mxRecord);
         }
 
         debug('addDnsRecords: %j', records);
diff --git a/src/scripts/setup_infra.sh b/src/scripts/setup_infra.sh
index e9e817203..8208a32ec 100755
--- a/src/scripts/setup_infra.sh
+++ b/src/scripts/setup_infra.sh
@@ -20,7 +20,6 @@ readonly fqdn="$2"
 readonly mail_fqdn="$3"
 readonly mail_tls_cert="$4"
 readonly mail_tls_key="$5"
-readonly enable_incoming_mail="$6"
 
 # removing containers ensures containers are launched with latest config updates
 # restore code in appatask does not delete old containers
@@ -62,24 +61,22 @@ if docker images "${GRAPHITE_REPO}" | tail -n +2 | awk '{ print $1 ":" $2 }' | g
 fi
 
 # recvmail (exposes port 993 and 25)
-if [[ "${enable_incoming_mail}" == "true" ]]; then
-    recvmail_container_id=$(docker run --restart=always -d --name="recvmail" \
-        -m 75m \
-        --memory-swap 150m \
-        -h "${fqdn}" \
-        -e "MAIL_DOMAIN=${fqdn}" \
-        -e "MAIL_SERVER_NAME=${mail_fqdn}" \
-        -v "${data_dir}/box/recvmail:/app/data" \
-        -v "${mail_tls_key}:/etc/tls_key.pem:ro" \
-        -v "${mail_tls_cert}:/etc/tls_cert.pem:ro" \
-        -p 993:9993 \
-        -p 25:2525 \
-        --read-only -v /tmp -v /run \
-        "${RECVMAIL_IMAGE}")
-    echo "recvmail container id: ${recvmail_container_id}"
-    if docker images "${RECVMAIL_REPO}" | tail -n +2 | awk '{ print $1 ":" $2 }' | grep -v "${RECVMAIL_IMAGE}" | xargs --no-run-if-empty docker rmi; then
-        echo "Removed old recvmail images"
-    fi
+recvmail_container_id=$(docker run --restart=always -d --name="recvmail" \
+    -m 75m \
+    --memory-swap 150m \
+    -h "${fqdn}" \
+    -e "MAIL_DOMAIN=${fqdn}" \
+    -e "MAIL_SERVER_NAME=${mail_fqdn}" \
+    -v "${data_dir}/box/recvmail:/app/data" \
+    -v "${mail_tls_key}:/etc/tls_key.pem:ro" \
+    -v "${mail_tls_cert}:/etc/tls_cert.pem:ro" \
+    -p 993:9993 \
+    -p 25:2525 \
+    --read-only -v /tmp -v /run \
+    "${RECVMAIL_IMAGE}")
+echo "recvmail container id: ${recvmail_container_id}"
+if docker images "${RECVMAIL_REPO}" | tail -n +2 | awk '{ print $1 ":" $2 }' | grep -v "${RECVMAIL_IMAGE}" | xargs --no-run-if-empty docker rmi; then
+    echo "Removed old recvmail images"
 fi
 
 # mail (MAIL_SMTP_PORT is 2500 in addons.js. used in mailer.js as well)
diff --git a/src/settings.js b/src/settings.js
index c4b50f945..ed035b8c0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -35,9 +35,6 @@ exports = module.exports = {
     getDefaultSync: getDefaultSync,
     getAll: getAll,
 
-    // TODO: make proper setting
-    isIncomingMailEnabled: function () { return true; },
-
     AUTOUPDATE_PATTERN_KEY: 'autoupdate_pattern',
     TIME_ZONE_KEY: 'time_zone',
     CLOUDRON_NAME_KEY: 'cloudron_name',