diff --git a/docker-compose.yml b/docker-compose.yml
index efdfef9e..fc87a2f8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -909,6 +909,16 @@ services:
       networks:
         - frontend
 
+### Mailcatcher ################################################
+    mailcatcher:
+      build: ./mailcatcher
+      ports:
+        - "1025:1025"
+        - "1080:1080"
+      networks:
+        - frontend
+        - backend
+
 ### Mailhog ################################################
     mailhog:
       build: ./mailhog
diff --git a/mailcatcher/Dockerfile b/mailcatcher/Dockerfile
new file mode 100644
index 00000000..6135085f
--- /dev/null
+++ b/mailcatcher/Dockerfile
@@ -0,0 +1,7 @@
+FROM schickling/mailcatcher
+
+LABEL maintainer="Johannes Schickling <schickling.j@gmail.com>"
+
+CMD ["mailcatcher", "--no-quit", "--foreground", "--ip=0.0.0.0"]
+
+EXPOSE 1025 1080