diff --git a/plugins/mail/postfix-policyd b/plugins/postfix/postfix-policyd
similarity index 100%
rename from plugins/mail/postfix-policyd
rename to plugins/postfix/postfix-policyd
diff --git a/plugins/mail/postfix-queue-size b/plugins/postfix/postfix-queue-size
similarity index 99%
rename from plugins/mail/postfix-queue-size
rename to plugins/postfix/postfix-queue-size
index d4d5f81b..f471b260 100755
--- a/plugins/mail/postfix-queue-size
+++ b/plugins/postfix/postfix-queue-size
@@ -103,7 +103,7 @@ case $1 in
 	cat <<'EOF'
 graph_title Postfix Queue Size
 graph_vlabel KB in Queue
-graph_category postfix
+graph_category mail
 graph_total Total
 active.label active
 deferred.label deferred
diff --git a/plugins/mail/postfix-rbl-blocked-mails b/plugins/postfix/postfix-rbl-blocked-mails
similarity index 100%
rename from plugins/mail/postfix-rbl-blocked-mails
rename to plugins/postfix/postfix-rbl-blocked-mails
diff --git a/plugins/mail/postfix_filtered b/plugins/postfix/postfix_filtered
similarity index 100%
rename from plugins/mail/postfix_filtered
rename to plugins/postfix/postfix_filtered
diff --git a/plugins/mail/postfix_filtered_awk b/plugins/postfix/postfix_filtered_awk
similarity index 100%
rename from plugins/mail/postfix_filtered_awk
rename to plugins/postfix/postfix_filtered_awk
diff --git a/plugins/postfix/postfix_mail_stats b/plugins/postfix/postfix_mail_stats
index 2ac2866e..b300b3a8 100755
--- a/plugins/postfix/postfix_mail_stats
+++ b/plugins/postfix/postfix_mail_stats
@@ -36,10 +36,10 @@ fi
 if [ "$1" = "config" ]; then
 
         echo 'graph_title Postfix Mail Counter'
-        echo 'graph_category postfix'
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel Hourly Messages'
-        echo 'recieved.label Delivered'
+        echo 'graph_category mail'
+        echo 'received.label Delivered'
         echo 'sent.label Outgoing'
         echo 'rejecthelo.label Invalid HELO'
         echo 'rejectsenderdomain.label need FQDN'
@@ -49,21 +49,21 @@ if [ "$1" = "config" ]; then
         exit 0
 fi
 
-echo -en "recieved.value "
-echo $(grep "postfix/lmtp\[" $LOGFILE | grep "$DATE" -c)
+echo -en "received.value "
+echo $(grep "status=sent (delivered" $LOGFILE | grep "$DATE" | wc -l)
 echo -n
 echo -en "sent.value "
-echo $(grep "postfix/smtp\[" $LOGFILE | grep "$DATE" -c)
+echo $(grep "status=sent (250" $LOGFILE | grep "$DATE" | wc -l)
 echo -en "rejecthelo.value "
-echo $(grep "Helo command rejected: need fully-qualified hostname" $LOGFILE | grep "$DATE" -c)
+echo $(grep "Helo command rejected: need fully-qualified hostname" $LOGFILE | grep "$DATE" | wc -l)
 echo -en "rejectsenderdomain.value "
-echo $(grep "Sender address rejected: Domain not found" $LOGFILE | grep "$DATE" -c)
+echo $(grep "Sender address rejected: Domain not found" $LOGFILE | grep "$DATE" | wc -l)
 
 
 echo -en "denyrelay.value "
-echo $(grep "Relay access denied" $LOGFILE | grep "$DATE" -c)
+echo $(grep "Relay access denied" $LOGFILE | grep "$DATE" | wc -l)
 echo -en "spamhaus.value "
-echo $(grep "blocked using sbl-xbl.spamhaus.org" $LOGFILE | grep "$DATE" -c)
+echo $(grep "blocked using sbl-xbl.spamhaus.org" $LOGFILE | grep "$DATE" | wc -l)
 echo -en "spamcop.value "
-echo $(grep "blocked using bl.spamcop.net" $LOGFILE | grep "$DATE" -c)
+echo $(grep "blocked using bl.spamcop.net" $LOGFILE | grep "$DATE" | wc -l)
 
diff --git a/plugins/mail/postfix_mail_stats b/plugins/postfix/postfix_mail_stats1
similarity index 81%
rename from plugins/mail/postfix_mail_stats
rename to plugins/postfix/postfix_mail_stats1
index b300b3a8..2ac2866e 100755
--- a/plugins/mail/postfix_mail_stats
+++ b/plugins/postfix/postfix_mail_stats1
@@ -36,10 +36,10 @@ fi
 if [ "$1" = "config" ]; then
 
         echo 'graph_title Postfix Mail Counter'
+        echo 'graph_category postfix'
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel Hourly Messages'
-        echo 'graph_category mail'
-        echo 'received.label Delivered'
+        echo 'recieved.label Delivered'
         echo 'sent.label Outgoing'
         echo 'rejecthelo.label Invalid HELO'
         echo 'rejectsenderdomain.label need FQDN'
@@ -49,21 +49,21 @@ if [ "$1" = "config" ]; then
         exit 0
 fi
 
-echo -en "received.value "
-echo $(grep "status=sent (delivered" $LOGFILE | grep "$DATE" | wc -l)
+echo -en "recieved.value "
+echo $(grep "postfix/lmtp\[" $LOGFILE | grep "$DATE" -c)
 echo -n
 echo -en "sent.value "
-echo $(grep "status=sent (250" $LOGFILE | grep "$DATE" | wc -l)
+echo $(grep "postfix/smtp\[" $LOGFILE | grep "$DATE" -c)
 echo -en "rejecthelo.value "
-echo $(grep "Helo command rejected: need fully-qualified hostname" $LOGFILE | grep "$DATE" | wc -l)
+echo $(grep "Helo command rejected: need fully-qualified hostname" $LOGFILE | grep "$DATE" -c)
 echo -en "rejectsenderdomain.value "
-echo $(grep "Sender address rejected: Domain not found" $LOGFILE | grep "$DATE" | wc -l)
+echo $(grep "Sender address rejected: Domain not found" $LOGFILE | grep "$DATE" -c)
 
 
 echo -en "denyrelay.value "
-echo $(grep "Relay access denied" $LOGFILE | grep "$DATE" | wc -l)
+echo $(grep "Relay access denied" $LOGFILE | grep "$DATE" -c)
 echo -en "spamhaus.value "
-echo $(grep "blocked using sbl-xbl.spamhaus.org" $LOGFILE | grep "$DATE" | wc -l)
+echo $(grep "blocked using sbl-xbl.spamhaus.org" $LOGFILE | grep "$DATE" -c)
 echo -en "spamcop.value "
-echo $(grep "blocked using bl.spamcop.net" $LOGFILE | grep "$DATE" | wc -l)
+echo $(grep "blocked using bl.spamcop.net" $LOGFILE | grep "$DATE" -c)
 
diff --git a/plugins/mail/postfix_mailfiltered b/plugins/postfix/postfix_mailfiltered
similarity index 100%
rename from plugins/mail/postfix_mailfiltered
rename to plugins/postfix/postfix_mailfiltered
diff --git a/plugins/postfix/postfix_mailqueue_ b/plugins/postfix/postfix_mailqueue_
index 8154a677..c2d4cb7b 100755
--- a/plugins/postfix/postfix_mailqueue_
+++ b/plugins/postfix/postfix_mailqueue_
@@ -106,7 +106,7 @@ case $1 in
 		echo "graph_title Postfix Mailqueue $CONFIG";
 		cat <<'EOF'
 graph_vlabel Mails in queue
-graph_category postfix
+graph_category mail
 graph_total Total
 active.label active
 deferred.label deferred
diff --git a/plugins/postfix/postfix_mailqueuelog_ b/plugins/postfix/postfix_mailqueuelog_
index 4a7cf79e..4ccc8f6a 100755
--- a/plugins/postfix/postfix_mailqueuelog_
+++ b/plugins/postfix/postfix_mailqueuelog_
@@ -144,7 +144,7 @@ if ($ARGV[0] and $ARGV[0] eq "config")
     print "graph_vlabel Mails in Queue log\n";
     print "graph_scale  no\n"; # so we do not print "micro, milli, kilo, etc"
 #    print "graph_total  Total\n";
-    print "graph_category postfix\n";
+    print "graph_category mail\n";
     foreach my $i (@status_list)
     {
 		if ($descriptions{$i})
diff --git a/plugins/mail/postfix_mailstats b/plugins/postfix/postfix_mailstats
similarity index 98%
rename from plugins/mail/postfix_mailstats
rename to plugins/postfix/postfix_mailstats
index 0f9b2203..c21e2df2 100755
--- a/plugins/mail/postfix_mailstats
+++ b/plugins/postfix/postfix_mailstats
@@ -72,7 +72,7 @@ sub config
     print "graph_vlabel mails / \${graph_period}\n";
     print "graph_scale  no\n";
     print "graph_total  Total\n";
-    print "graph_category postfix\n";
+    print "graph_category mail\n";
     print "delivered.label delivered\n";
     print "delivered.type ABSOLUTE\n";
     print "delivered.draw AREA\n";
diff --git a/plugins/postfix/postfix_mailstats_ b/plugins/postfix/postfix_mailstats_
index 59d7f4ba..b3a7f489 100755
--- a/plugins/postfix/postfix_mailstats_
+++ b/plugins/postfix/postfix_mailstats_
@@ -145,7 +145,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" )
 	print "graph_vlabel mails / \${graph_period}\n";
 	print "graph_scale  no\n";
 	print "graph_total  Total\n";
-	print "graph_category postfix\n";
+	print "graph_category mail\n";
 	print "delivered.label delivered\n";
 	print "delivered.type DERIVE\n";
 	print "delivered.draw AREA\n";
diff --git a/plugins/postfix/postfix_mailvolume_multi b/plugins/postfix/postfix_mailvolume_multi
index c155e31c..4e7401e5 100755
--- a/plugins/postfix/postfix_mailvolume_multi
+++ b/plugins/postfix/postfix_mailvolume_multi
@@ -158,7 +158,7 @@ if ($ARGV[0] and $ARGV[0] eq "config")
 	print "graph_args --base 1000 -l 0\n";
 	print "graph_vlabel bytes / \${graph_period}\n";
 	print "graph_scale yes\n";
-	print "graph_category postfix\n";
+	print "graph_category mail\n";
 	print "graph_total Throughput sum\n";
 	# loop through the postfix names and create per config an entry
 	foreach $syslog_name (@postfix_syslog_name)
diff --git a/plugins/mail/postfix_stats b/plugins/postfix/postfix_stats
similarity index 100%
rename from plugins/mail/postfix_stats
rename to plugins/postfix/postfix_stats