diff --git a/docker-compose.yml b/docker-compose.yml
index c303417..055b47f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,6 +54,37 @@
       - ./gerrit/index/:/var/gerrit/index/:rw
       - ./gerrit/cache/:/var/gerrit/cache/:rw
       - ./gerrit/gerrit-oauth-provider.jar:/var/gerrit/plugins/gerrit-oauth-provider.jar:ro
+  mailserver:
+    image: ghcr.io/docker-mailserver/docker-mailserver:12
+    #container_name: mailserver
+    # Provide the FQDN of your mail server here (Your DNS MX record should point to this value)
+    hostname: mail.${SA_PUBLIC_DOMAIN_NAME}
+    env_file: mail/mailserver.env
+    # More information about the mail-server ports:
+    # https://docker-mailserver.github.io/docker-mailserver/latest/config/security/understanding-the-ports/
+    # To avoid conflicts with yaml base-60 float, DO NOT remove the quotation marks.
+    ports:
+      - "25:25"    # SMTP  (explicit TLS => STARTTLS)
+      - "143:143"  # IMAP4 (explicit TLS => STARTTLS)
+      - "465:465"  # ESMTP (implicit TLS)
+      - "587:587"  # ESMTP (explicit TLS => STARTTLS)
+      - "993:993"  # IMAP4 (implicit TLS)
+    volumes:
+      - ./logs/mail-supervisor/:/var/log/supervisor/:rw
+      - ./logs/mail/:/var/log/mail/:rw
+      - ./mail/data/:/var/mail/:rw
+      - ./mail/state/:/var/mail-state/:rw
+      - ./mail/config/:/tmp/docker-mailserver/:rw
+      - /etc/localtime:/etc/localtime:ro
+    restart: always
+    stop_grace_period: 1m
+    # Uncomment if using `ENABLE_FAIL2BAN=1`:
+    # cap_add:
+    #   - NET_ADMIN
+    healthcheck:
+      test: "ss --listening --tcp | grep -P 'LISTEN.+:smtp' || exit 1"
+      timeout: 3s
+      retries: 0
 networks:
   simpleidnet:
     driver: bridge