diff --git a/apache/tasks/server_status.yml b/apache/tasks/server_status.yml
index efd2b00e..38daf285 100644
--- a/apache/tasks/server_status.yml
+++ b/apache/tasks/server_status.yml
@@ -68,3 +68,10 @@
     insertafter: "[apache_*]"
     create: no
   notify: restart munin-node
+
+- name: add mailgraph URL in index.html
+  lineinfile:
+    dest: /var/www/index.html
+    state: present
+    line: '            <li><a href="/mailgraph">Stats Mail</a></li>'
+    insertbefore: "</ul>"
diff --git a/apache/templates/evolinux-default.conf.j2 b/apache/templates/evolinux-default.conf.j2
index 68cdcf84..effa55c6 100644
--- a/apache/templates/evolinux-default.conf.j2
+++ b/apache/templates/evolinux-default.conf.j2
@@ -35,6 +35,15 @@
         Include /etc/apache2/ipaddr_whitelist.conf
     </Directory>
 
+    # Mailgraph configuration
+    Alias /mailgraph /usr/share/mailgraph
+    <Directory /usr/share/mailgraph>
+        DirectoryIndex mailgraph.cgi
+        Require all granted
+        Options +FollowSymLinks +ExecCGI
+        AddHandler cgi-script .cgi
+    </Directory>
+
     CustomLog /var/log/apache2/access.log vhost_combined
     ErrorLog /var/log/apache2/error.log
     LogLevel warn
@@ -118,6 +127,15 @@
             Include /etc/apache2/ipaddr_whitelist.conf
         </Location>
 
+        # Mailgraph configuration
+        Alias /mailgraph /usr/share/mailgraph
+        <Directory /usr/share/mailgraph>
+            DirectoryIndex mailgraph.cgi
+            Require all granted
+            Options +FollowSymLinks +ExecCGI
+            AddHandler cgi-script .cgi
+        </Directory>
+
 # BEGIN phpMyAdmin section
 # END phpMyAdmin section
 
diff --git a/postfix/tasks/packmail.yml b/postfix/tasks/packmail.yml
index 90d424b2..869113b0 100644
--- a/postfix/tasks/packmail.yml
+++ b/postfix/tasks/packmail.yml
@@ -10,6 +10,20 @@
   tags:
   - postfix
 
+- name: make /var/lib/mailgraph accessible by www-data
+  file:
+    path: "/var/lib/mailgraph"
+    state: directory
+    owner: www-data
+    group: www-data
+    mode: '0755'
+
+- name: make sure a service Mailgraph is running
+  systemd:
+    name: mailgraph.service
+    state: started  
+    enabled: true
+
 - name: create packmail main.cf
   template:
     src: packmail_main.cf.j2