--- a/Common.pm	Tue Dec 13 13:01:23 2011 +0100
+++ b/Common.pm	Tue Dec 13 13:39:03 2011 +0100
@@ -37,8 +37,7 @@
     imap_password  => { ARGS => "=s" },
     imap_quota =>
       { ARGS => "=i", DEFAULT => 300 * 1024 * 1024, ALIAS => "quota" },
-    imap_aclgroups => 
-      { ARGS => "=s", ALIAS => "aclgroups" },
+    imap_aclgroups => { ARGS => "=s", ALIAS => "aclgroups" },
 
     # dovecots mail_location (%1, %u & %d supported)
     imap_mail_location =>
@@ -56,11 +55,11 @@
     address  => { ARGS => "=s", ALIAS => "primary" },
 
     # * acl *
-    acl_admin => { ARGS => "=s" },
+    acl_admin    => { ARGS => "=s" },
     acl_password => { ARGS => "=s" },
-    folder   => { ARGS => ":s@" },
-    acl      => { ARGS => "=s" },
-    recursive => { ARGS => "!", DEFAULT => 0 },
+    folder       => { ARGS => ":s@" },
+    acl          => { ARGS => "=s" },
+    recursive    => { ARGS => "!", DEFAULT => 0 },
 
     # * alias * group *
     members => { ARGS => ":s" },
@@ -81,10 +80,10 @@
     ldap_oc_recipient   => { ARGS => "=s", DEFAULT => "XXXmailRecipient" },
     ldap_oc_accessgroup => { ARGS => "=s", DEFAULT => "XXXmailAccessGroup" },
 
-    ldap_at_address => { ARGS => "=s", DEFAULT => "XXXmailAddress" },
-    ldap_at_group   => { ARGS => "=s", DEFAULT => "XXXmailGroup" },
-    ldap_at_quota   => { ARGS => "=s", DEFAULT => "XXXmailQuota" },
-    ldap_at_aclgroups   => { ARGS => "=s", DEFAULT => "XXXmailACLGroups" },
+    ldap_at_address   => { ARGS => "=s", DEFAULT => "XXXmailAddress" },
+    ldap_at_group     => { ARGS => "=s", DEFAULT => "XXXmailGroup" },
+    ldap_at_quota     => { ARGS => "=s", DEFAULT => "XXXmailQuota" },
+    ldap_at_aclgroups => { ARGS => "=s", DEFAULT => "XXXmailACLGroups" },
     ldap_at_forwardingaddress =>
       { ARGS => "=s", DEFAULT => "XXXmailForwardingAddress" },
     ldap_at_primaryaddress =>