diff --git a/bin/setup_mail b/bin/setup_mail
deleted file mode 100644
index 80ba34e7b2..0000000000
--- a/bin/setup_mail
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-printf "Domain root: "
-read -r domain_root
-printf "Subdomain (can be empty): "
-read -r sub_domain
-
-if [ -z "$sub_domain" ]
-then
-  domain="${domain_root}"
-else
-  domain="${sub_domain}.${domain_root}"
-fi
-
-cat > ./docker/mail/mail.env <<EOF
-#!/bin/sh
-DOMAINNAME=${domain_root}
-MAILNAME=${domain}
-SSL_CERT=/etc/letsencrypt/live/${domain_root}/fullchain.pem
-SSL_KEY=/etc/letsencrypt/live/${domain_root}/privkey.pem
-EOF
\ No newline at end of file
diff --git a/docker/mail/Dockerfile b/docker/mail/Dockerfile
index b577416c1a..33d277fdf6 100644
--- a/docker/mail/Dockerfile
+++ b/docker/mail/Dockerfile
@@ -36,7 +36,7 @@ RUN \
 COPY rootfs/ /
 
 # Expose ports
-EXPOSE 25 143 587 993
+EXPOSE 110 143 587 993 995
 
 # Run start script
 ENTRYPOINT /usr/bin/start.sh
diff --git a/docker/mail/exec.sh b/docker/mail/exec.sh
deleted file mode 100644
index 2cc271698b..0000000000
--- a/docker/mail/exec.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-USAGE = "Usage: $0 new domain <domain_name>\n     : $0 new user <user_name> <user_password>\n     : $0 new alias <user_alias> <user_name>"
-
-if [ -z "$2" ]
-then
-  echo "$USAGE";
-  exit 1;
-fi
-
-if [ "$1" == "new" ]
-then
-	if [ "$2" == "domain" ]
-	then
-		docker exec mail new-domain "${*,3}"
-	elif [ "$2" == "user" ]
-	then
-		docker exec mail new-user "${*,3}"
-	elif [ "$2" == "alias" ]
-	then
-		docker exec mail new-alias "${*,3}"	
-	fi	
-fi
diff --git a/docker/mail/rootfs/etc/mail/opendkim/TrustedHosts b/docker/mail/rootfs/etc/mail/opendkim/TrustedHosts
index 4fa1f327a0..0930344eaa 100644
--- a/docker/mail/rootfs/etc/mail/opendkim/TrustedHosts
+++ b/docker/mail/rootfs/etc/mail/opendkim/TrustedHosts
@@ -8,6 +8,3 @@
 172.17.0.0/16
 fe80::/64
 #HOSTNAME
-
-#host.example.com
-#192.168.1.0/24
diff --git a/docker/mail/rootfs/usr/bin/start.sh b/docker/mail/rootfs/usr/bin/start.sh
index 8c3575a046..2674d6588a 100644
--- a/docker/mail/rootfs/usr/bin/start.sh
+++ b/docker/mail/rootfs/usr/bin/start.sh
@@ -1,18 +1,4 @@
 #!/bin/sh
-# Config postfix
-postconf -e myhostname="$MAILNAME"
-postconf -e mydomain="$DOMAINNAME"
-postconf -e smtpd_tls_cert_file="$SSL_CERT"
-postconf -e smtpd_tls_key_file="$SSL_KEY"
-
-# Config dovecot
-sed -i -e "s#^\s*ssl_cert\s*=.*#ssl_cert = <$SSL_CERT#" /etc/mail/dovecot/dovecot.conf
-sed -i -e "s#^\s*ssl_key\s*=.*#ssl_key = <$SSL_KEY#" /etc/mail/dovecot/dovecot.conf
-sed -i -e "s#^\s*hostname\s*=.*#hostname = $MAILNAME#" /etc/mail/dovecot/dovecot.conf
-sed -i -e "s#^\s*postmaster_address\s*=.*#postmaster_address = $POSTMASTER#" /etc/mail/dovecot/dovecot.conf
-
-# Config dkim
-sed -i -e "s/#HOSTNAME/$MAILNAME/" /etc/mail/opendkim/TrustedHosts
 
 # Run openssl
 if [ ! -e "$SSL_CERT" ]
@@ -28,6 +14,7 @@ then
 	opendkim-genkey -d "$DOMAINNAME" -D "/var/opendkim/keys"
 fi
 
+# Prepare postfix
 if [ ! -d "/var/mail/$DOMAINNAME" ]
 then
 	touch /etc/mail/aliases /etc/mail/domains /etc/mail/mailboxes /etc/mail/passwd
diff --git a/docker/mail/setup.sh b/docker/mail/setup.sh
new file mode 100644
index 0000000000..7d8c8c1e25
--- /dev/null
+++ b/docker/mail/setup.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+printf "Domain root: "
+read -r domain_root
+printf "Subdomain (can be empty): "
+read -r sub_domain
+
+if [ -z "$sub_domain" ]
+then
+  domain="${domain_root}"
+else
+  domain="${sub_domain}.${domain_root}"
+fi
+
+cat > mail.env <<EOF
+#!/bin/sh
+DOMAINNAME=${domain_root}
+MAILNAME=${domain}
+SSL_CERT=/etc/letsencrypt/live/${domain_root}/fullchain.pem
+SSL_KEY=/etc/letsencrypt/live/${domain_root}/privkey.pem
+EOF
+
+
+# Config postfix
+sed -i -e "s#^\s*myhostname\s*=.*#myhostname = $MAILNAME#" rootfs/etc/mail/postfix/main.cf
+sed -i -e "s#^\s*mydomain\s*=.*#mydomain = $DOMAINNAME#" rootfs/etc/mail/postfix/main.cf
+sed -i -e "s#^\s*smtpd_tls_cert_file\s*=.*#smtpd_tls_cert_file = $SSL_CERT#" rootfs/etc/mail/postfix/main.cf
+sed -i -e "s#^\s*smtpd_tls_key_file\s*=.*#smtpd_tls_key_file = $SSL_KEY#" rootfs/etc/mail/postfix/main.cf
+
+# Config dovecot
+sed -i -e "s#^\s*ssl_cert\s*=.*#ssl_cert = <$SSL_CERT#" rootfs/etc/mail/dovecot/dovecot.conf
+sed -i -e "s#^\s*ssl_key\s*=.*#ssl_key = <$SSL_KEY#" rootfs/etc/mail/dovecot/dovecot.conf
+sed -i -e "s#^\s*hostname\s*=.*#hostname = $MAILNAME#" rootfs/etc/mail/dovecot/dovecot.conf
+sed -i -e "s#^\s*postmaster_address\s*=.*#postmaster_address = $POSTMASTER#" rootfs/etc/mail/dovecot/dovecot.conf
+
+# Config dkim
+sed -i -e "s/#HOSTNAME/$MAILNAME/" rootfs/etc/mail/opendkim/TrustedHosts