diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 008cfc9f50fb8bf4592db709fb087ef378070022..567eb32d9247c839a8e7f1f4d923ef1070fd22a1 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -31,6 +31,7 @@ relayhost_user=
 relayhost_password=
 mailbox_size_limit=0
 message_size_limit=0
+mailbox_quota_stats=y
 realtime_blackhole_list=
 
 [getmail]
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 6af44981c446b226901c1771b4f35f87b3a28bf8..1ac88b95a1a8da67227739d8f8b19bd092b05e27 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -292,6 +292,12 @@ $form["tabs"]['mail'] = array(
 			'width' => '10',
 			'maxlength' => '15'
 		),
+		'mailbox_quota_stats' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value' => array(0 => 'n',1 => 'y')
+		),
 		'realtime_blackhole_list' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 0d237bf0f180abd972e44cdd90dd79838fd36d54..cca491ee1a29bfb84e1f5e76ca4fdb6cd68b0930 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -163,4 +163,5 @@ $wb["php_settings_txt"] = 'PHP Settings';
 $wb["apps_vhost_settings_txt"] = 'Apps Vhost Settings';
 $wb["awstats_settings_txt"] = 'AWStats Settings';
 $wb["firewall_txt"] = 'Firewall';
+$wb["mailbox_quota_stats_txt"] = 'Mailbox quota statistic';
 ?>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index 11399b319e6c303da1699cd4a81064310613a1f8..cb67f29ac4b4830bc3f113f3b1a88e596d7fbed9 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -71,6 +71,12 @@
         <label for="message_size_limit">{tmpl_var name='message_size_limit_txt'}</label>
         <input name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15" type="text" class="textInput formLengthLimit" />&nbsp;MB
       </div>
+	  <div class="ctrlHolder">
+		<p class="label">{tmpl_var name='mailbox_quota_stats_txt'}</p>
+			<div class="multiField">
+				{tmpl_var name='mailbox_quota_stats'}
+			</div>
+	  </div>
       <div class="ctrlHolder">
         <label for="realtime_blackhole_list">{tmpl_var name='realtime_blackhole_list_txt'}</label>
         <input name="realtime_blackhole_list" id="realtime_blackhole_list" value="{tmpl_var name='realtime_blackhole_list'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='realtime_blackhole_list_note_txt'}
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index fa1b189f3a4460d7d81f9b4429513869c5b25e69..2bc95d8564178cafe4c0547ea68a1a67332b0466 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -117,7 +117,7 @@ class monitor_core_module {
 	}
 
     private function _monitorEmailQuota() {
-        global $app;
+        global $app, $conf;
 
         /*
 		 *  This monitoring is expensive, so do it only every 15 minutes
@@ -125,6 +125,10 @@ class monitor_core_module {
 		$min = @date('i');
 		if ($min % 15 != 0) return;
 		
+		$app->uses('getconf');
+		$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
+		if($mail_config['mailbox_quota_stats'] == 'n') return;
+		
 		
 		/*
          * First we get the Monitoring-data from the tools