diff --git a/html/includes/graphs/application/mailscanner_reject.inc.php b/html/includes/graphs/application/mailscanner_reject.inc.php
new file mode 100644
index 0000000000..4098e28f39
--- /dev/null
+++ b/html/includes/graphs/application/mailscanner_reject.inc.php
@@ -0,0 +1,38 @@
+<?php
+
+include("includes/graphs/common.inc.php");
+
+$scale_min    = 0;
+$colours      = "mixed";
+$nototal      = (($width < 550) ? 1 : 0);
+$unit_text    = "Messages";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mailscanner-" . $app['app_id'] . ".rrd";
+$array        = array(
+                      'msg_rejected' => array('descr' => 'Rejected'),
+                      'msg_relay' => array('descr' => 'Relayed'),
+                      'msg_waiting' => array('descr' => 'Waiting'),
+                     );
+
+$i            = 0;
+$x            = 0;
+
+if (is_file($rrd_filename))
+{
+  $max_colours = count($config['graph_colours'][$colours]);
+  foreach ($array as $ds => $vars)
+  {
+    $x = (($x<=$max_colours) ? $x : 0);
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    $rrd_list[$i]['descr']    = $vars['descr'];
+    $rrd_list[$i]['ds']       = $ds;
+    $rrd_list[$i]['colour']   = $config['graph_colours'][$colours][$x];
+    $i++;
+    $x++;
+  }
+} else {
+  echo("file missing: $file");
+}
+
+include("includes/graphs/generic_multi_line.inc.php");
+
+?>
diff --git a/html/includes/graphs/application/mailscanner_sent.inc.php b/html/includes/graphs/application/mailscanner_sent.inc.php
new file mode 100644
index 0000000000..55cacf9928
--- /dev/null
+++ b/html/includes/graphs/application/mailscanner_sent.inc.php
@@ -0,0 +1,27 @@
+<?php
+
+$nototal		 = 1;
+
+$ds_in			 = "msg_recv";
+$ds_out			 = "msg_sent";
+
+$graph_titel		.= "::messages";
+$unit_text		 = "Messages";
+
+$colour_line_in		 = "008800FF";
+$colour_line_out	 = "000088FF";
+$colour_area_in		 = "CEFFCE66";
+$colour_area_out	 = "CECEFF66";
+$colour_area_in_max	 = "CC88CC";
+$colour_area_out_max	 = "FFEFAA";
+
+$mailscanner_rrd	 = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mailscanner-" . $app['app_id'] . ".rrd";
+
+if (is_file($mailscanner_rrd))
+{
+  $rrd_filename = $mailscanner_rrd;
+}
+
+include("includes/graphs/generic_duplex.inc.php");
+
+?>
diff --git a/html/includes/graphs/application/mailscanner_spam.inc.php b/html/includes/graphs/application/mailscanner_spam.inc.php
new file mode 100644
index 0000000000..ed0a79b4b6
--- /dev/null
+++ b/html/includes/graphs/application/mailscanner_spam.inc.php
@@ -0,0 +1,32 @@
+<?php
+
+include("includes/graphs/common.inc.php");
+
+$scale_min    = 0;
+$nototal      = (($width < 550) ? 1 : 0);
+$unit_text    = "Messages";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mailscanner-" . $app['app_id'] . ".rrd";
+$array        = array(
+                      'spam' => array('descr' => 'Spam', 'colour' => 'FF8800'),
+                      'virus' => array('descr' => 'Virus', 'colour' => 'FF0000')
+                     );
+
+$i            = 0;
+
+if (is_file($rrd_filename))
+{
+  foreach ($array as $ds => $vars)
+  {
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    $rrd_list[$i]['descr']    = $vars['descr'];
+    $rrd_list[$i]['ds']       = $ds;
+    $rrd_list[$i]['colour']   = $vars['colour'];
+    $i++;
+  }
+} else {
+  echo("file missing: $file");
+}
+
+include("includes/graphs/generic_multi_simplex_seperated.inc.php");
+
+?>
diff --git a/html/pages/device/apps/mailscanner.inc.php b/html/pages/device/apps/mailscanner.inc.php
index b2644aedde..2464fcaacd 100644
--- a/html/pages/device/apps/mailscanner.inc.php
+++ b/html/pages/device/apps/mailscanner.inc.php
@@ -2,7 +2,9 @@
 
 global $config;
 
-$graphs = array('mailscanner_stats' => 'MailScanner Statistics');
+$graphs = array('mailscanner_sent' => 'Mailscanner - Sent / Received',
+		'mailscanner_spam' => 'Mailscanner - Spam / Virus',
+		'mailscanner_reject' => 'Mailscanner - Rejected / Waiting / Relayed');
 
 foreach ($graphs as $key => $text)
 {
diff --git a/html/pages/device/apps/powerdns.inc.php b/html/pages/device/apps/powerdns.inc.php
index 6816fa8da3..491ac3121c 100644
--- a/html/pages/device/apps/powerdns.inc.php
+++ b/html/pages/device/apps/powerdns.inc.php
@@ -2,13 +2,13 @@
 
 global $config;
 
-$graphs = array('powerdns_latency'  => 'Latency',
-                'powerdns_fail' => 'Corrupt - Failed - Timed out',
-                'powerdns_packetcache' => 'Packet Cache',
-                'powerdns_querycache' => 'Query Cache',
-                'powerdns_recursing' => 'Recursing Queries and Answers',
-                'powerdns_queries' => 'Total UDP/TCP Queries and Answers',
-                'powerdns_queries_udp' => 'Detail UDP IPv4/IPv6 Queries and Answers');
+$graphs = array('powerdns_latency'  => 'PowerDNS - Latency',
+                'powerdns_fail' => 'PowerDNS - Corrupt / Failed / Timed out',
+                'powerdns_packetcache' => 'PowerDNS - Packet Cache',
+                'powerdns_querycache' => 'PowerDNS - Query Cache',
+                'powerdns_recursing' => 'PowerDNS - Recursing Queries and Answers',
+                'powerdns_queries' => 'PowerDNS - Total UDP/TCP Queries and Answers',
+                'powerdns_queries_udp' => 'PowerDNS - Detail UDP IPv4/IPv6 Queries and Answers');
 
 foreach ($graphs as $key => $text)
 {