diff --git a/README.md b/README.md
index 6e869fc..3b90601 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@ Visit the [Phishing Club Guide](https://phishing.club/guide/introduction/) for m
 | 8002 | Backend API | Backend API server |
 | 8003 | Frontend | Development frontend with Vite |
 | 8101 | Database Viewer | DBGate database administration |
-| 8102 | Mail Server | Mailpit SMTP server for testing |
+| 8102 | Mail Server | Mailpit SMTP server with SpamAssassin integration |
 | 8103 | Container Logs | Dozzle log viewer |
 | 8104 | Container Stats | Docker container statistics |
 | 8201 | ACME Server | Pebble ACME server for certificates |
diff --git a/docker-compose.yml b/docker-compose.yml
index b54efe2..cd28129 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -77,9 +77,21 @@ services:
     environment:
       MP_SMTP_AUTH_ACCEPT_ANY: 1
       MP_SMTP_AUTH_ALLOW_INSECURE: 1
+      MP_ENABLE_SPAMASSASSIN: spamassassin:783
+    depends_on:
+      - spamassassin
     networks:
       - default
 
+  # SpamAssassin - Spam detection and scoring
+  spamassassin:
+    image: axllent/spamassassin
+    container_name: spamassassin
+    restart: unless-stopped
+    networks:
+      - default
+  #
+
   # Pebble - ACME server for testing
   # Used to test TLS certificate requesting via ACME
   pebble: