diff --git a/install/tpl/debian6_dovecot.conf.master b/install/tpl/debian6_dovecot.conf.master
index e7b050f0a8af149d5a4479a3fe91cda9e2b0bcea..2ce0db34e28a8247bad207f134d6dae3bb766295 100644
--- a/install/tpl/debian6_dovecot.conf.master
+++ b/install/tpl/debian6_dovecot.conf.master
@@ -48,10 +48,7 @@ protocol lda {
 
 ## Plugin settings
 plugin {
-  quota = maildir
-
-  # Disabled user quota reporting for the first upload
-  # quota = dict:user::file:/var/vmail/%n_%d_quota
+  quota = dict:user::file:/var/vmail/%n_%d_quota
   # Because the mail quota is called in the user query 
   # the maildir quota does not need to be set.
   # You do not need: quota = maildir
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index b6a54ae99d34588bf4f81b27a01dcb36aa65146c..be3c6311383fb1109034e1889f17c2df3e23a8b6 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -220,7 +220,7 @@ $form["tabs"]['address'] = array (
 			'datatype'	=> 'VARCHAR',
 
 			'formtype'	=> 'SELECT',
-			'default'	=> 'DE',
+			'default'	=> '$conf["country"]',
 			'datasource'	=> array ( 	'type'	=> 'SQL',
 										'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name',
 										'keyfield'=> 'iso',
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index 6baa1bb1084e505e71d111842b36f4fdeb7ab61e..f5258e386e51e1929f48993ab6782cb605d7042f 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -149,7 +149,6 @@ class monitor_tools {
 		return array('name' => $distname, 'version' => $distver, 'id' => $distid, 'baseid' => $distbaseid);
 	}
 
-/*
     //** Email Quota
     public function monitorEmailQuota() {
         global $conf;
@@ -184,7 +183,6 @@ class monitor_tools {
 		$res['state'] = $state;
         return $res;
     }
-*/
 
     //** Filesystem Quota
 	public function monitorHDQuota() {
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index a0410c88fa00d70fd238d9a92fac7785b418e49f..4294e542cd73c90391084edb438ae452d1e1f66e 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -86,7 +86,7 @@ class monitor_core_module {
 		/*
 		 * Calls the single Monitoring steps 
 		 */
-//		$this->_monitorEmailQuota();
+		$this->_monitorEmailQuota();
 		$this->_monitorHDQuota();
 		$this->_monitorServer();
 		$this->_monitorOsVer();