diff --git a/docker-compose.yml b/docker-compose.yml
index b1944ec2..c16d0ed4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -344,6 +344,14 @@ services:
         links:
             - php-fpm
 
+### Mailhog Container #########################################
+
+    mailhog:
+        build: ./mailhog
+        ports:
+            - "1025:1025"
+            - "8025:8025"
+
 ### Selenium Container #########################################
 
     selenium:
diff --git a/mailhog/Dockerfile b/mailhog/Dockerfile
new file mode 100644
index 00000000..9fd31e4e
--- /dev/null
+++ b/mailhog/Dockerfile
@@ -0,0 +1,7 @@
+FROM mailhog/mailhog
+
+Maintainer Mahmoud Zalt <mahmoud@zalt.me>
+
+CMD ["Mailhog"]
+
+EXPOSE 1025 8025