diff --git a/html/includes/graphs/application/mailscanner_reject.inc.php b/html/includes/graphs/application/mailscanner_reject.inc.php
index 4098e28f3..e7af32b30 100644
--- a/html/includes/graphs/application/mailscanner_reject.inc.php
+++ b/html/includes/graphs/application/mailscanner_reject.inc.php
@@ -5,8 +5,8 @@ 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";
+$unit_text    = "Messages/sec";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mailscannerV2-" . $app['app_id'] . ".rrd";
 $array        = array(
                       'msg_rejected' => array('descr' => 'Rejected'),
                       'msg_relay' => array('descr' => 'Relayed'),
diff --git a/html/includes/graphs/application/mailscanner_sent.inc.php b/html/includes/graphs/application/mailscanner_sent.inc.php
index 55cacf992..8747feca4 100644
--- a/html/includes/graphs/application/mailscanner_sent.inc.php
+++ b/html/includes/graphs/application/mailscanner_sent.inc.php
@@ -6,7 +6,7 @@ $ds_in			 = "msg_recv";
 $ds_out			 = "msg_sent";
 
 $graph_titel		.= "::messages";
-$unit_text		 = "Messages";
+$unit_text		 = "Messages/sec";
 
 $colour_line_in		 = "008800FF";
 $colour_line_out	 = "000088FF";
@@ -15,7 +15,7 @@ $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";
+$mailscanner_rrd	 = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mailscannerV2-" . $app['app_id'] . ".rrd";
 
 if (is_file($mailscanner_rrd))
 {
diff --git a/html/includes/graphs/application/mailscanner_spam.inc.php b/html/includes/graphs/application/mailscanner_spam.inc.php
index ed0a79b4b..05ab8c3fa 100644
--- a/html/includes/graphs/application/mailscanner_spam.inc.php
+++ b/html/includes/graphs/application/mailscanner_spam.inc.php
@@ -4,8 +4,8 @@ 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";
+$unit_text    = "Messages/sec";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mailscannerV2-" . $app['app_id'] . ".rrd";
 $array        = array(
                       'spam' => array('descr' => 'Spam', 'colour' => 'FF8800'),
                       'virus' => array('descr' => 'Virus', 'colour' => 'FF0000')
diff --git a/includes/polling/applications/mailscanner.inc.php b/includes/polling/applications/mailscanner.inc.php
index b1f2eb54a..60a95d355 100644
--- a/includes/polling/applications/mailscanner.inc.php
+++ b/includes/polling/applications/mailscanner.inc.php
@@ -2,7 +2,7 @@
 
 ## Polls MailScanner statistics from script via SNMP
 
-$rrd_filename  = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mailscanner-" . $app['app_id'] . ".rrd";
+$rrd_filename  = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mailscannerV2-" . $app['app_id'] . ".rrd";
 $options       = "-O qv";
 $oid           = "nsExtendOutputFull.11.109.97.105.108.115.99.97.110.110.101.114";
 
@@ -15,13 +15,13 @@ list ($msg_recv, $msg_rejected, $msg_relay, $msg_sent, $msg_waiting, $spam, $vir
 if (!is_file($rrd_filename))
 {
   rrdtool_create($rrd_filename, "--step 300 \
-        DS:msg_recv:GAUGE:600:0:125000000000 \
-        DS:msg_rejected:GAUGE:600:0:125000000000 \
-        DS:msg_relay:GAUGE:600:0:125000000000 \
-        DS:msg_sent:GAUGE:600:0:125000000000 \
-        DS:msg_waiting:GAUGE:600:0:125000000000 \
-        DS:spam:GAUGE:600:0:125000000000 \
-        DS:virus:GAUGE:600:0:125000000000 \
+        DS:msg_recv:COUNTER:600:0:125000000000 \
+        DS:msg_rejected:COUNTER:600:0:125000000000 \
+        DS:msg_relay:COUNTER:600:0:125000000000 \
+        DS:msg_sent:COUNTER:600:0:125000000000 \
+        DS:msg_waiting:COUNTER:600:0:125000000000 \
+        DS:spam:COUNTER:600:0:125000000000 \
+        DS:virus:COUNTER:600:0:125000000000 \
         RRA:AVERAGE:0.5:1:600 \
         RRA:AVERAGE:0.5:6:700 \
         RRA:AVERAGE:0.5:24:775 \
diff --git a/scripts/mailscanner.php b/scripts/mailscanner.php
index 7d23c1752..17319f51c 100644
--- a/scripts/mailscanner.php
+++ b/scripts/mailscanner.php
@@ -70,6 +70,6 @@
 	}
 
 	doSNMPv2($mailstats);
-	clearStats($mailstats);
+	//clearStats($mailstats);
 
 ?>
\ No newline at end of file