--- a/Common.pm	Wed Nov 23 13:05:59 2011 +0100
+++ b/Common.pm	Thu Nov 24 11:57:31 2011 +0100
@@ -28,9 +28,12 @@
     # * account *
     default_domain => { ARGS => "=s", DEFAULT => "" },
     imap_server =>  { ARGS => "=s", DEFAULT => "localhost" },
+    imap_port =>  { ARGS => "=s", DEFAULT => "143" },
     imap_admin =>   { ARGS => "=s", DEFAULT => $ENV{USER} },
     imap_password =>{ ARGS => "=s" },
-    imap_quota =>   { ARGS => "=i", DEFAULT => 300, ALIAS => "quota" },
+    imap_quota =>   { ARGS => "=i", DEFAULT => 300 * 1024 * 1024, ALIAS => "quota" },
+    # dovecots mail_location (%1, %u & %d supported)
+    imap_mail_location => { ARGS => "=s", DEFAULT => '/var/vmail/users/%d/%1/%u' },
 
     mbox =>	    { ARGS => "!",  DEFAULT => 1 },
     password =>	    { ARGS => "=s" },
@@ -63,6 +66,7 @@
 
     ldap_at_address =>	    { ARGS => "=s", DEFAULT => "XXXmailAddress" },
     ldap_at_group =>	    { ARGS => "=s", DEFAULT => "XXXmailGroup" },
+    ldap_at_quota =>	    { ARGS => "=s", DEFAULT => "XXXmailQuota" },
     ldap_at_forwardingaddress =>
 			    { ARGS => "=s", DEFAULT => "XXXmailForwardingAddress" },
     ldap_at_primaryaddress =>