diff --git a/management/daemon.py b/management/daemon.py
index 572b6b4a..918370ef 100755
--- a/management/daemon.py
+++ b/management/daemon.py
@@ -520,6 +520,20 @@ def privacy_status_set():
 	utils.write_settings(config, env)
 	return "OK"
 
+# Mailgraph
+
+@app.route('/mailgraph/image.cgi')
+@authorized_personnel_only
+def mailgraph():
+	if request.query_string:
+		return utils.shell(
+			"check_output",
+			["/usr/share/mailgraph/mailgraph.cgi"],
+			env={"QUERY_STRING": request.query_string}
+		)
+	return ''
+
+
 # MUNIN
 
 @app.route('/munin/')
diff --git a/management/templates/index.html b/management/templates/index.html
index 31fe5916..9f8b8652 100644
--- a/management/templates/index.html
+++ b/management/templates/index.html
@@ -102,7 +102,7 @@
                 <li><a href="#mail-guide" onclick="return show_panel(this);">Instructions</a></li>
                 <li><a href="#users" onclick="return show_panel(this);">Users</a></li>
                 <li><a href="#aliases" onclick="return show_panel(this);">Aliases</a></li>
-                <li><a href="#reports" onclick="return show_report(this);">Reports</a></li>
+                <li><a href="#mailgraph" onclick="return show_panel(this);">Mailgraph</a></li>
               </ul>
             </li>
             <li><a href="#sync_guide" onclick="return show_panel(this);">Contacts/Calendar</a></li>
diff --git a/management/templates/mailgraph.html b/management/templates/mailgraph.html
index 9d495b0c..8b1ad893 100644
--- a/management/templates/mailgraph.html
+++ b/management/templates/mailgraph.html
@@ -1,4 +1,4 @@
-<h1>Mail statistics</h1>
+<h2>Mail statistics</h2>
 <ul id="jump">
   <li><a href="#G0">Day</a>&nbsp;</li>
   <li><a href="#G1">Week</a>&nbsp;</li>
@@ -6,25 +6,25 @@
   <li><a href="#G3">Year</a>&nbsp;</li>
 </ul>
 
-<h2 id="G0">Last Day</h2>
-<p><img src="?image=0-n" alt="mailgraph"/></p>
-<p><img src="?image=0-e" alt="mailgraph"/></p>
-<p><img src="?image=0-g" alt="mailgraph"/></p>
+<h3 id="G0">Last Day</h3>
+<p><img src="/admin/mailgraph/image.cgi?image=0-n" alt="mailgraph"/></p>
+<p><img src="/admin/mailgraph/image.cgi?image=0-e" alt="mailgraph"/></p>
+<p><img src="/admin/mailgraph/image.cgi?image=0-g" alt="mailgraph"/></p>
 
-<h2 id="G1">Last Week</h2>
-<p><img src="?image=1-n" alt="mailgraph"/></p>
-<p><img src="?image=1-e" alt="mailgraph"/></p>
-<p><img src="?image=1-g" alt="mailgraph"/></p>
+<h3 id="G1">Last Week</h3>
+<p><img src="/admin/mailgraph/image.cgi?image=1-n" alt="mailgraph"/></p>
+<p><img src="/admin/mailgraph/image.cgi?image=1-e" alt="mailgraph"/></p>
+<p><img src="/admin/mailgraph/image.cgi?image=1-g" alt="mailgraph"/></p>
 
-<h2 id="G2">Last Month</h2>
-<p><img src="?image=2-n" alt="mailgraph"/></p>
-<p><img src="?image=2-e" alt="mailgraph"/></p>
-<p><img src="?image=2-g" alt="mailgraph"/></p>
+<h3 id="G2">Last Month</h3>
+<p><img src="/admin/mailgraph/image.cgi?image=2-n" alt="mailgraph"/></p>
+<p><img src="/admin/mailgraph/image.cgi?image=2-e" alt="mailgraph"/></p>
+<p><img src="/admin/mailgraph/image.cgi?image=2-g" alt="mailgraph"/></p>
 
-<h2 id="G3">Last Year</h2>
-<p><img src="?image=3-n" alt="mailgraph"/></p>
-<p><img src="?image=3-e" alt="mailgraph"/></p>
-<p><img src="?image=3-g" alt="mailgraph"/></p>
+<h3 id="G3">Last Year</h3>
+<p><img src="/admin/mailgraph/image.cgi?image=3-n" alt="mailgraph"/></p>
+<p><img src="/admin/mailgraph/image.cgi?image=3-e" alt="mailgraph"/></p>
+<p><img src="/admin/mailgraph/image.cgi?image=3-g" alt="mailgraph"/></p>
 
 <hr/>