diff --git a/tmail/Dockerfile b/tmail/Dockerfile
index f8da238..8a74e21 100644
--- a/tmail/Dockerfile
+++ b/tmail/Dockerfile
@@ -25,11 +25,12 @@ ENV MAIL_OPTS=
 VOLUME /var/mail
 EXPOSE 25 110
 
-CMD twistd -n mail --esmtp \
-                   --smtp=tcp:25 \
-                   --pop3=tcp:110 \
+CMD twistd -n mail --bounce-to-postmaster \
+                   --esmtp \
+                   --hostname=$MAIL_NAME \
                    --maildirdbmdomain=$MAIL_NAME=$MAIL_PATH \
+                   --pop3=tcp:110 \
+                   --smtp=tcp:25 \
                    --user=$MAIL_USER=$MAIL_PASS \
-                   --bounce-to-postmaster \
                    $MAIL_OPTS