diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index d224da66b51dd353c1601f37669593749500b292..ee6d4c657431ed1cb553d56a1c762c05a0e19f8a 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -56,7 +56,7 @@
       </span>
       <span class="wf_oneField">
         <label for="limit_mailquota" class="wf_preField">{tmpl_var name='limit_mailquota_txt'}</label>
-        <input type="text" id="limit_mailquota" name="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10">
+        <input type="text" id="limit_mailquota" name="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10"> MB
       </span>
       <span class="wf_oneField">
         <label for="limit_spamfilter_wblist" class="wf_preField">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index 310deb708d39cb62dab38043b2821e9502e561e7..e7a0ca7993300b62d52a3bd4aa41259dc17395cc 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -1,50 +1,50 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_mail_user">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_mail_user"><legend>Mailbox</legend>
-      <span class="wf_oneField">
-        <label for="email_local_part" class="wf_preField">{tmpl_var name='email_txt'}</label>
-        <input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" size="20" maxlength="50">&nbsp;@&nbsp;
-        <select id="email_domain" name="email_domain">{tmpl_var name="email_domain"}</select>
-      </span>
-      <span class="wf_oneField">
-        <label for="password" class="wf_preField">{tmpl_var name='cryptpwd_txt'}</label>
-        <input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255" onkeyup="pass_check(this.value)">
-      </span>
-      <span class="wf_oneField">
-        <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
-        <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</span></span>
-      </span>
-      <span class="wf_oneField">
-        <label for="quota" class="wf_preField">{tmpl_var name='quota_txt'}</label>
-        <input type="text" id="quota" name="quota" value="{tmpl_var name='quota'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="policy" class="wf_preField">{tmpl_var name='policy_txt'}</label>
-        <select id="policy" name="policy">{tmpl_var name="policy"}</select>
-      </span>
-      <span class="wf_oneField">
-        <label for="postfix" class="wf_preField">{tmpl_var name='postfix_txt'}</label>
-        <span class="">{tmpl_var name='postfix'}</span>
-      </span>
-      <span class="wf_oneField">
-        <label for="disableimap" class="wf_preField">{tmpl_var name='disableimap_txt'}</label>                    
-        <span class="">{tmpl_var name='disableimap'}</span>
-      </span>
-      <span class="wf_oneField">
-        <label for="disablepop3" class="wf_preField">{tmpl_var name='disablepop3_txt'}</label>                    
-        <span class="">{tmpl_var name='disablepop3'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_user">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_user"><legend>Mailbox</legend>
+      <span class="wf_oneField">
+        <label for="email_local_part" class="wf_preField">{tmpl_var name='email_txt'}</label>
+        <input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" size="20" maxlength="50">&nbsp;@&nbsp;
+        <select id="email_domain" name="email_domain">{tmpl_var name="email_domain"}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="password" class="wf_preField">{tmpl_var name='cryptpwd_txt'}</label>
+        <input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255" onkeyup="pass_check(this.value)">
+      </span>
+      <span class="wf_oneField">
+        <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+        <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</span></span>
+      </span>
+      <span class="wf_oneField">
+        <label for="quota" class="wf_preField">{tmpl_var name='quota_txt'}</label>
+        <input type="text" id="quota" name="quota" value="{tmpl_var name='quota'}" size="30" maxlength="255"> MB
+      </span>
+      <span class="wf_oneField">
+        <label for="policy" class="wf_preField">{tmpl_var name='policy_txt'}</label>
+        <select id="policy" name="policy">{tmpl_var name="policy"}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="postfix" class="wf_preField">{tmpl_var name='postfix_txt'}</label>
+        <span class="">{tmpl_var name='postfix'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="disableimap" class="wf_preField">{tmpl_var name='disableimap_txt'}</label>                    
+        <span class="">{tmpl_var name='disableimap'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="disablepop3" class="wf_preField">{tmpl_var name='disablepop3_txt'}</label>                    
+        <span class="">{tmpl_var name='disablepop3'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/ftp_user_edit.htm b/interface/web/sites/templates/ftp_user_edit.htm
index f2e3d870bb0c94e0f2bc31b37ad14d0620b24e3f..d3e961c066284b084501a61062db66e78aee9ed9 100644
--- a/interface/web/sites/templates/ftp_user_edit.htm
+++ b/interface/web/sites/templates/ftp_user_edit.htm
@@ -1,43 +1,43 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_ftp_user">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_ftp_user"><legend>FTP User</legend>
-      <span class="wf_oneField">
-        <label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
-        <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
-      </span>
-      <span class="wf_oneField">
-        <label for="username" class="wf_preField">{tmpl_var name='username_txt'}</label>
-		{tmpl_var name='username_prefix'}
-        <input type="text" id="username" name="username" value="{tmpl_var name='username'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="password" class="wf_preField">{tmpl_var name='password_txt'}</label>
-        <input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255" onkeyup="pass_check(this.value)">
-      </span>
-      <span class="wf_oneField">
-        <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
-        <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</span></span>
-      </span>
-      <span class="wf_oneField">
-        <label for="quota_size" class="wf_preField">{tmpl_var name='quota_size_txt'}</label>
-        <input type="text" id="quota_size" name="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7">
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    <span class="">
-                      {tmpl_var name='active'}
-                    </span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/ftp_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/ftp_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_ftp_user">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_ftp_user"><legend>FTP User</legend>
+      <span class="wf_oneField">
+        <label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
+        <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="username" class="wf_preField">{tmpl_var name='username_txt'}</label>
+		{tmpl_var name='username_prefix'}
+        <input type="text" id="username" name="username" value="{tmpl_var name='username'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="password" class="wf_preField">{tmpl_var name='password_txt'}</label>
+        <input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255" onkeyup="pass_check(this.value)">
+      </span>
+      <span class="wf_oneField">
+        <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+        <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</span></span>
+      </span>
+      <span class="wf_oneField">
+        <label for="quota_size" class="wf_preField">{tmpl_var name='quota_size_txt'}</label>
+        <input type="text" id="quota_size" name="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7"> MB
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    <span class="">
+                      {tmpl_var name='active'}
+                    </span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/ftp_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/ftp_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm
index 0425c7c52c6225957d18d5caafd4b46b644dccb2..e2526381f6afb657b701d7d26d103ff53635b623 100644
--- a/interface/web/sites/templates/shell_user_edit.htm
+++ b/interface/web/sites/templates/shell_user_edit.htm
@@ -1,46 +1,46 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_shell_user">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_shell_user"><legend>Shell User</legend>
-      <span class="wf_oneField">
-        <label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
-        <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
-      </span>
-      <span class="wf_oneField">
-        <label for="username" class="wf_preField">{tmpl_var name='username_txt'}</label>
-		{tmpl_var name='username_prefix'}
-        <input type="text" id="username" name="username" value="{tmpl_var name='username'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="password" class="wf_preField">{tmpl_var name='password_txt'}</label>
-        <input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255" onkeyup="pass_check(this.value)">
-      </span>
-      <span class="wf_oneField">
-        <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
-        <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</span></span>
-      </span>
-      <span class="wf_oneField">
-        <label for="chroot" class="wf_preField">{tmpl_var name='chroot_txt'}</label>
-        <select id="chroot" name="chroot">{tmpl_var name='chroot'}</select>
-      </span>
-      <span class="wf_oneField">
-        <label for="quota_size" class="wf_preField">{tmpl_var name='quota_size_txt'}</label>
-        <input type="text" id="quota_size" name="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7">
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
-        <span class="">{tmpl_var name='active'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/shell_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/shell_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_shell_user">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_shell_user"><legend>Shell User</legend>
+      <span class="wf_oneField">
+        <label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
+        <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="username" class="wf_preField">{tmpl_var name='username_txt'}</label>
+		{tmpl_var name='username_prefix'}
+        <input type="text" id="username" name="username" value="{tmpl_var name='username'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="password" class="wf_preField">{tmpl_var name='password_txt'}</label>
+        <input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255" onkeyup="pass_check(this.value)">
+      </span>
+      <span class="wf_oneField">
+        <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+        <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</span></span>
+      </span>
+      <span class="wf_oneField">
+        <label for="chroot" class="wf_preField">{tmpl_var name='chroot_txt'}</label>
+        <select id="chroot" name="chroot">{tmpl_var name='chroot'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="quota_size" class="wf_preField">{tmpl_var name='quota_size_txt'}</label>
+        <input type="text" id="quota_size" name="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7"> MB
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/shell_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/shell_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index d09ec4da4518399782d06977773f9ee0e3ff821a..0a92965e741e1e23bbbad5762fec7d096cfa9d93 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -44,7 +44,7 @@
 -->      
       <span class="wf_oneField">
         <label for="hd_quota" class="wf_preField">{tmpl_var name='hd_quota_txt'}</label>
-        <input type="text" id="hd_quota" name="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7">
+        <input type="text" id="hd_quota" name="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7"> MB
       </span>
 <!--
       <span class="wf_oneField">