diff --git a/interface/web/dns/templates/dns_a_edit.htm b/interface/web/dns/templates/dns_a_edit.htm
index 2004e6c2d5406e1e9fb01cdf853744730817c3d2..395abcd43295c58079ee728091829e1a6dfa900c 100644
--- a/interface/web/dns/templates/dns_a_edit.htm
+++ b/interface/web/dns/templates/dns_a_edit.htm
@@ -4,14 +4,15 @@
 <div class="panel panel_dns_a">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS A</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="name">{tmpl_var name='name_txt'}</label>
         <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+				<p class="formHint">{tmpl_var name='name_hint_txt'}</p>
 			</div>
       <div class="ctrlHolder">
       	<label for="data">{tmpl_var name='data_txt'}</label>
-        <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput formLengthIPv4" />
 			</div>
       <div class="ctrlHolder">
       	<label for="ttl">{tmpl_var name='ttl_txt'}</label>
diff --git a/interface/web/dns/templates/dns_alias_edit.htm b/interface/web/dns/templates/dns_alias_edit.htm
index 928535a4710e5b0feb77d79bd2b8516e0f20fee6..50a3335839b3549b7201123948f964a088b93cb3 100644
--- a/interface/web/dns/templates/dns_alias_edit.htm
+++ b/interface/web/dns/templates/dns_alias_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_dns_alias">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS ALIAS</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="name">{tmpl_var name='name_txt'}</label>
         <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/dns/templates/dns_cname_edit.htm b/interface/web/dns/templates/dns_cname_edit.htm
index 47d590e14da413d81305f55507c3e0a555a2cdb5..dd799afdae4838e94aba1a31fc81f6f292e65646 100644
--- a/interface/web/dns/templates/dns_cname_edit.htm
+++ b/interface/web/dns/templates/dns_cname_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_dns_cname">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS CNAME</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="name">{tmpl_var name='name_txt'}</label>
         <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/dns/templates/dns_hinfo_edit.htm b/interface/web/dns/templates/dns_hinfo_edit.htm
index 7dc9a2e0a59a0261ecdc8b4d75c197eb54757e68..976d3cfdd5e1dc936f973849a1987ed4f3282635 100644
--- a/interface/web/dns/templates/dns_hinfo_edit.htm
+++ b/interface/web/dns/templates/dns_hinfo_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_dns_hinfo">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS HINFO</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="name">{tmpl_var name='name_txt'}</label>
         <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/dns/templates/dns_mx_edit.htm b/interface/web/dns/templates/dns_mx_edit.htm
index bab2c1df80c01b11dac625736c86c12af3ba61d4..3e16f7fffc9d101e667380c6dc5e4b88d1087aec 100644
--- a/interface/web/dns/templates/dns_mx_edit.htm
+++ b/interface/web/dns/templates/dns_mx_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_dns_mx">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS mx</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="name">{tmpl_var name='name_txt'}</label>
         <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
@@ -15,7 +15,7 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="aux">{tmpl_var name='aux_txt'}</label>
-        <input name="aux" id="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10" type="text" class="textInput" />
+        <input name="aux" id="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
 			</div>
       <div class="ctrlHolder">
       	<label for="ttl">{tmpl_var name='ttl_txt'}</label>
diff --git a/interface/web/dns/templates/dns_ns_edit.htm b/interface/web/dns/templates/dns_ns_edit.htm
index f86e7e8a3f4b0051dde1a13949091ae27ad2f14b..1d9d0e7a4f22769032e61011114f6074219d1aa8 100644
--- a/interface/web/dns/templates/dns_ns_edit.htm
+++ b/interface/web/dns/templates/dns_ns_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_dns_ns">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS ns</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="name">{tmpl_var name='name_txt'}</label>
         <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/dns/templates/dns_ptr_edit.htm b/interface/web/dns/templates/dns_ptr_edit.htm
index 881d2ecb96f24d69329df3018e44f853d8406b49..45f35162ab8fec400415a77c232544d4c7ef050e 100644
--- a/interface/web/dns/templates/dns_ptr_edit.htm
+++ b/interface/web/dns/templates/dns_ptr_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_dns_ptr">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS ptr</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="name">{tmpl_var name='name_txt'}</label>
         <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/dns/templates/dns_rp_edit.htm b/interface/web/dns/templates/dns_rp_edit.htm
index 1fafc6af3ff3a3b6e081d577596e533690210f41..20adddc72192c31ac811454822158f4ca00bd466 100644
--- a/interface/web/dns/templates/dns_rp_edit.htm
+++ b/interface/web/dns/templates/dns_rp_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_dns_rp">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS RP</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="name">{tmpl_var name='name_txt'}</label>
         <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/dns/templates/dns_srv_edit.htm b/interface/web/dns/templates/dns_srv_edit.htm
index 9c217addc6164b9b41f1af36146c77cc7d1ab091..154f52df3ce80ab04d6dc70493626c3ac12769f5 100644
--- a/interface/web/dns/templates/dns_srv_edit.htm
+++ b/interface/web/dns/templates/dns_srv_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_dns_srv">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS SRV</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="name">{tmpl_var name='name_txt'}</label>
         <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/dns/templates/dns_template_edit.htm b/interface/web/dns/templates/dns_template_edit.htm
index 7b695ac25f652565a59748d7d57bdd0ba36076b8..34cf3b1e09dc64ca163d36445a1e835b563e3ce5 100644
--- a/interface/web/dns/templates/dns_template_edit.htm
+++ b/interface/web/dns/templates/dns_template_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_dns_template">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS Template</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="name">{tmpl_var name='name_txt'}</label>
         <input name="name" id="name" value="{tmpl_var name='name'}" size="40" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/dns/templates/dns_txt_edit.htm b/interface/web/dns/templates/dns_txt_edit.htm
index b465ed84d34aa65999eb934b206af8d74d620bb4..4dfb3213d89066c35e34611d9b747205ec3a7f71 100644
--- a/interface/web/dns/templates/dns_txt_edit.htm
+++ b/interface/web/dns/templates/dns_txt_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_dns_txt">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS TXT</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="name">{tmpl_var name='name_txt'}</label>
         <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index d659e52fe771794fb522398f165fa7193edc3c7f..770ff781871a0ee260f222040669840782ae1489 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -1,32 +1,32 @@
-<?php
-$wb['custom_mailfilter_txt'] = 'Custom mail filter recipe';
-$wb['email_txt'] = 'Email';
-$wb['cryptpwd_txt'] = 'Passwort';
-$wb['active_txt'] = 'Aktiv';
+<?php
+$wb['custom_mailfilter_txt'] = 'Custom mail filter recipe';
+$wb['email_txt'] = 'Email';
+$wb['cryptpwd_txt'] = 'Passwort';
+$wb['active_txt'] = 'Aktiv';
 $wb['email_error_isemail'] = 'Emailadresse ist ungültig.';
 $wb['email_error_unique'] = 'Doppelte Emailadresse.';
-$wb['autoresponder_text_txt'] = 'Text';
-$wb['autoresponder_txt'] = 'Autoresponder';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$wb['error_no_pwd'] = 'Passwort ist leer.';
-$wb['quota_error_isint'] = 'Mailboxgröße muss eine Zahl sein.';
-$wb['quota_txt'] = 'Quota in MB';
-$wb['server_id_txt'] = 'server_id';
-$wb['password_txt'] = 'Passwort';
-$wb['maildir_txt'] = 'Maildir';
-$wb['postfix_txt'] = 'Aktiviere Empfang';
-$wb['access_txt'] = 'Aktiviere Zugriff';
-$wb['policy_txt'] = 'Spamfilter';
-$wb['no_policy'] = '- nicht aktiviert -';
-$wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.';
-$wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is';
-$wb['welcome_mail_subject'] = 'Welcome to your new email account.';
-$wb['welcome_mail_message'] = 'Welcome to your new email account.';
-$wb['disableimap_txt'] = 'IMAP deaktivieren';
-$wb['disablepop3_txt'] = 'POP3 deaktivieren';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Autoresponder';
+$wb['no_domain_perm'] = 'You have no permission for this domain.';
+$wb['error_no_pwd'] = 'Passwort ist leer.';
+$wb['quota_error_isint'] = 'Mailboxgröße muss eine Zahl sein.';
+$wb['quota_txt'] = 'Quota';
+$wb['server_id_txt'] = 'server_id';
+$wb['password_txt'] = 'Passwort';
+$wb['maildir_txt'] = 'Maildir';
+$wb['postfix_txt'] = 'Aktiviere Empfang';
+$wb['access_txt'] = 'Aktiviere Zugriff';
+$wb['policy_txt'] = 'Spamfilter';
+$wb['no_policy'] = '- nicht aktiviert -';
+$wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.';
+$wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is';
+$wb['welcome_mail_subject'] = 'Welcome to your new email account.';
+$wb['welcome_mail_message'] = 'Welcome to your new email account.';
+$wb['disableimap_txt'] = 'IMAP deaktivieren';
+$wb['disablepop3_txt'] = 'POP3 deaktivieren';
 $wb['password_strength_txt'] = 'Passwortkomplexität';
 $wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
 $wb['welcome_mail_fromemail_txt'] = 'webmaster@ihredomain.at';
-?>
-
-
+?>
+
+
diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng
index ec2618ad9ca607cffe443f4e106f6001127ae664..c6db506090f6755f1fcef4cb3c636ffda72d0f1e 100644
--- a/interface/web/mail/lib/lang/en_mail_user.lng
+++ b/interface/web/mail/lib/lang/en_mail_user.lng
@@ -11,10 +11,10 @@ $wb["autoresponder_txt"] = 'Autoresponder';
 $wb["no_domain_perm"] = 'You have no permission for this domain.';
 $wb["error_no_pwd"] = 'Password is empty.';
 $wb["quota_error_isint"] = 'Mailbox size must be a number.';
-$wb["quota_txt"] = 'quota in MB';
-$wb["server_id_txt"] = 'server_id';
-$wb["password_txt"] = 'password';
-$wb["maildir_txt"] = 'maildir';
+$wb["quota_txt"] = 'Quota';
+$wb["server_id_txt"] = 'Aerver_id';
+$wb["password_txt"] = 'Password';
+$wb["maildir_txt"] = 'Maildir';
 $wb["postfix_txt"] = 'Enable Receiving';
 $wb["access_txt"] = 'Enable Access';
 $wb["policy_txt"] = 'Spamfilter';
diff --git a/interface/web/mail/templates/mail_alias_edit.htm b/interface/web/mail/templates/mail_alias_edit.htm
index 512d0ece4bc0e13ed88bbacb5e411693c0ecc6a3..f00eb1e5b6b0b16321ff4f465de04a17bdbf2147 100644
--- a/interface/web/mail/templates/mail_alias_edit.htm
+++ b/interface/web/mail/templates/mail_alias_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_alias">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Email Alias</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
         <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
         <div class="multiField">
diff --git a/interface/web/mail/templates/mail_blacklist_edit.htm b/interface/web/mail/templates/mail_blacklist_edit.htm
index 752e5cd9ab6d76ba28fb39d14b624431b9a90137..e64fe2d5da009120196fac32fcf47c19321c31c7 100644
--- a/interface/web/mail/templates/mail_blacklist_edit.htm
+++ b/interface/web/mail/templates/mail_blacklist_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_blacklist">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Blacklist</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
         <select name="server_id" id="server_id" class="selectInput">
diff --git a/interface/web/mail/templates/mail_content_filter_edit.htm b/interface/web/mail/templates/mail_content_filter_edit.htm
index be0c7200c19fa7e525b71f5d547fd86f730cf009..ffe844e8d2462141db6967b866e205e8b8168fac 100644
--- a/interface/web/mail/templates/mail_content_filter_edit.htm
+++ b/interface/web/mail/templates/mail_content_filter_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_content_filter">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Filter</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
         <select name="server_id" id="server_id" class="selectInput">
diff --git a/interface/web/mail/templates/mail_domain_catchall_edit.htm b/interface/web/mail/templates/mail_domain_catchall_edit.htm
index 8117511b1f474e76eb6a04c5ac6812153fbb1b2b..9f4c71e234b163f3e4cee9cab22e4270e9a225d3 100644
--- a/interface/web/mail/templates/mail_domain_catchall_edit.htm
+++ b/interface/web/mail/templates/mail_domain_catchall_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_domain_catchall">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Email Catchall</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
         <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
         <div class="multiField">
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 68ab821721d1498c79d9f98354f8ca8e1919a602..2b6f64122af5f2c186913da85779399f246f4b45 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_domain">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Domain</legend>
+    <fieldset class="inlineLabels">
       <tmpl_if name="is_admin">
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
diff --git a/interface/web/mail/templates/mail_forward_edit.htm b/interface/web/mail/templates/mail_forward_edit.htm
index 9e9091b3dca70e602a2d38416676140af613a138..8ec15320929ed2bb6ebb605225617386132dd899 100644
--- a/interface/web/mail/templates/mail_forward_edit.htm
+++ b/interface/web/mail/templates/mail_forward_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_forward">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Email Forward</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
         <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
         <div class="multiField">
diff --git a/interface/web/mail/templates/mail_get_edit.htm b/interface/web/mail/templates/mail_get_edit.htm
index aab36db6cbfbaa804730f393a90e5d4823bc89ab..2da485e38d04d3ee07a06802c01356b33aa21a91 100644
--- a/interface/web/mail/templates/mail_get_edit.htm
+++ b/interface/web/mail/templates/mail_get_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_get">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Get Email</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="type">{tmpl_var name='type_txt'}</label>
         <select name="type" id="type" class="selectInput">
diff --git a/interface/web/mail/templates/mail_transport_edit.htm b/interface/web/mail/templates/mail_transport_edit.htm
index 9250082658476f5d328122287a53b697f8bb0f57..5f16db366232a0d3e0faf56f91a46c87cf0e1f68 100644
--- a/interface/web/mail/templates/mail_transport_edit.htm
+++ b/interface/web/mail/templates/mail_transport_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_transport">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Email transport</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
         <select name="server_id" id="server_id" class="selectInput">
diff --git a/interface/web/mail/templates/mail_user_autoresponder_edit.htm b/interface/web/mail/templates/mail_user_autoresponder_edit.htm
index 5c47d576ebf87ac8d820bc282a6fdd5df2118d5e..883c3527304cb53bcf1c5d4129f058a97d3234c8 100644
--- a/interface/web/mail/templates/mail_user_autoresponder_edit.htm
+++ b/interface/web/mail/templates/mail_user_autoresponder_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_user">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Autoresponder</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="autoresponder_text">{tmpl_var name='autoresponder_text_txt'}</label>
         <textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea>
diff --git a/interface/web/mail/templates/mail_user_custom_rules_edit.htm b/interface/web/mail/templates/mail_user_custom_rules_edit.htm
index 01b0668cfec56c76de88decf8d729bdd4556dce4..0ca1b3c6ec6e0612eff92b029e6e067a0cbe6f6f 100644
--- a/interface/web/mail/templates/mail_user_custom_rules_edit.htm
+++ b/interface/web/mail/templates/mail_user_custom_rules_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_user">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Custom Rules</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="custom_mailfilter">{tmpl_var name='custom_mailfilter_txt'}</label>
         <textarea name="custom_mailfilter" id="custom_mailfilter" rows='15' cols='30'>{tmpl_var name='custom_mailfilter'}</textarea>
diff --git a/interface/web/mail/templates/mail_user_filter_edit.htm b/interface/web/mail/templates/mail_user_filter_edit.htm
index 8ef2396c9a4013b074df082e5282196c00ff2f8a..ef228e1603e6e42e4ca2575e657cfcf57df0ef21 100644
--- a/interface/web/mail/templates/mail_user_filter_edit.htm
+++ b/interface/web/mail/templates/mail_user_filter_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_user_filter">
 
   <div class="pnl_formsarea">
-    <fieldset id="wf_area_mail_user_filter"><legend>Filter</legend>
+    <fieldset id="wf_area_mail_user_filter">
       <span class="wf_oneField">
         <label for="rulename" class="wf_preField">{tmpl_var name='rulename_txt'}</label>
         <input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" size="30" maxlength="255">
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index 9045dbf0a0ee1403c330130141f0f721a80e14b8..4dbda409cc63482364eecc3b47cad813a561a884 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_user">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Mailbox</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
         <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
         <div class="multiField">
@@ -24,7 +24,7 @@
 			</div>
 			<div class="ctrlHolder">
       	<label for="quota">{tmpl_var name='quota_txt'}</label>
-        <input name="quota" id="quota" value="{tmpl_var name='quota'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />
+        <input name="quota" id="quota" value="{tmpl_var name='quota'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;MB</p>
 			</div>
 			<div class="ctrlHolder">
       	<label for="policy">{tmpl_var name='policy_txt'}</label>
diff --git a/interface/web/mail/templates/mail_user_mailfilter_edit.htm b/interface/web/mail/templates/mail_user_mailfilter_edit.htm
index dffddcd6d6665761637e808b9f6bcfeb2eedef26..a9d205b211689ac10aad4e0a0ef86ccbbfb95763 100644
--- a/interface/web/mail/templates/mail_user_mailfilter_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailfilter_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_user">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Mail Filter</legend>
+    <fieldset class="inlineLabels">
     </fieldset>
 
     <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/mail/templates/mail_whitelist_edit.htm b/interface/web/mail/templates/mail_whitelist_edit.htm
index 171fbcc109701351bb4e5eb96492eddf884a56e0..d8e6b8b53bdd0f0d9e2e62ec47d9acc65db33356 100644
--- a/interface/web/mail/templates/mail_whitelist_edit.htm
+++ b/interface/web/mail/templates/mail_whitelist_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_mail_whitelist">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Witelist</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
         <select name="server_id" id="server_id" class="selectInput">
diff --git a/interface/web/mail/templates/spamfilter_blacklist_edit.htm b/interface/web/mail/templates/spamfilter_blacklist_edit.htm
index fc1d5d12a9cbc8bb3df8e460ab3d092d445748ca..36058d9a4c8a10d59d540bbc2c2f8c977a055327 100644
--- a/interface/web/mail/templates/spamfilter_blacklist_edit.htm
+++ b/interface/web/mail/templates/spamfilter_blacklist_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_blacklist">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Blacklist</legend>
+    <fieldset class="inlineLabels">
 <!--
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
diff --git a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm
index 393cf28d0353c5d42a58ac66510e6c177d0b64ec..1bdb88675bb5c6f4ed8b3a86b505271d4848f198 100644
--- a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm
+++ b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_config">
 
   <div class="pnl_formsarea">
-    <fieldset id="wf_area_spamfilter_config"><legend>Getmail</legend>
+    <fieldset id="wf_area_spamfilter_config">
       <span class="wf_oneField">
         <label for="getmail_config_dir" class="wf_preField">{tmpl_var name='getmail_config_dir_txt'}</label>
         <input type="text" id="getmail_config_dir" name="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" size="40" maxlength="255">
diff --git a/interface/web/mail/templates/spamfilter_config_mail_edit.htm b/interface/web/mail/templates/spamfilter_config_mail_edit.htm
index 78f433696695536f8909ef1094dbaa802a15e1c3..3526589ab1d6918b387c7aea5647796af6609288 100644
--- a/interface/web/mail/templates/spamfilter_config_mail_edit.htm
+++ b/interface/web/mail/templates/spamfilter_config_mail_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_config">
 
   <div class="pnl_formsarea">
-    <fieldset id="wf_area_spamfilter_config"><legend>Mail</legend>
+    <fieldset id="wf_area_spamfilter_config">
       <span class="wf_oneField">
         <label for="module" class="wf_preField">{tmpl_var name='module_txt'}</label>
         <select id="module" name="module">{tmpl_var name='module'}</select>
diff --git a/interface/web/mail/templates/spamfilter_config_server_edit.htm b/interface/web/mail/templates/spamfilter_config_server_edit.htm
index c5d62331639b51619b16f0a3ece0ec1c80ab4322..ac45009fd285f23f4338fbc2277c50f7b7a22760 100644
--- a/interface/web/mail/templates/spamfilter_config_server_edit.htm
+++ b/interface/web/mail/templates/spamfilter_config_server_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_config">
 
   <div class="pnl_formsarea">
-    <fieldset id="wf_area_spamfilter_config"><legend>Server</legend>
+    <fieldset id="wf_area_spamfilter_config">
       <span class="wf_oneField">
         <label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
         <input type="text" id="ip_address" name="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255">
diff --git a/interface/web/mail/templates/spamfilter_other_edit.htm b/interface/web/mail/templates/spamfilter_other_edit.htm
index a85aec04246f2ca0947090ef93be67b192c30644..404067198daa2f6e86f192e0db47a1163eacb579 100644
--- a/interface/web/mail/templates/spamfilter_other_edit.htm
+++ b/interface/web/mail/templates/spamfilter_other_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_policy">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Other</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="addr_extension_virus">{tmpl_var name='addr_extension_virus_txt'}</label>
         <input name="addr_extension_virus" id="addr_extension_virus" value="{tmpl_var name='addr_extension_virus'}" size="30" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/mail/templates/spamfilter_policy_edit.htm b/interface/web/mail/templates/spamfilter_policy_edit.htm
index 47802440c0f333e4d790828b6c31d68bbe54ab4d..b725df5fb379adb1b9567d354f254c1c3114d1eb 100644
--- a/interface/web/mail/templates/spamfilter_policy_edit.htm
+++ b/interface/web/mail/templates/spamfilter_policy_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_policy">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Policy</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="policy_name">{tmpl_var name='policy_name_txt'}</label>
         <input name="policy_name" id="policy_name" value="{tmpl_var name='policy_name'}" size="30" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/mail/templates/spamfilter_quarantine_edit.htm b/interface/web/mail/templates/spamfilter_quarantine_edit.htm
index 2bc97974fa39fa0f6eb89808ee265676ad2bb17e..de33b33c8c5e26e197e0326c02e6370d3ae5dfaf 100644
--- a/interface/web/mail/templates/spamfilter_quarantine_edit.htm
+++ b/interface/web/mail/templates/spamfilter_quarantine_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_policy">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Quarantine</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="virus_quarantine_to">{tmpl_var name='virus_quarantine_to_txt'}</label>
         <input name="virus_quarantine_to" id="virus_quarantine_to" value="{tmpl_var name='virus_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/mail/templates/spamfilter_taglevel_edit.htm b/interface/web/mail/templates/spamfilter_taglevel_edit.htm
index 45fa36adfd955c3ba2487c79daf9e727e4b0b85f..aef98d3d249c83bbf9610b5d45b892db5df9a100 100644
--- a/interface/web/mail/templates/spamfilter_taglevel_edit.htm
+++ b/interface/web/mail/templates/spamfilter_taglevel_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_policy">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Tag-Level</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="spam_tag_level">{tmpl_var name='spam_tag_level_txt'}</label>
         <input name="spam_tag_level" id="spam_tag_level" value="{tmpl_var name='spam_tag_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
diff --git a/interface/web/mail/templates/spamfilter_users_edit.htm b/interface/web/mail/templates/spamfilter_users_edit.htm
index 10b2e533f57353ad56032b7f76838908bab44a4f..01d5699228b257e7eb931b027461aa8110ff54fe 100644
--- a/interface/web/mail/templates/spamfilter_users_edit.htm
+++ b/interface/web/mail/templates/spamfilter_users_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_users">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Users</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
         <select name="server_id" id="server_id" class="selectInput">
diff --git a/interface/web/mail/templates/spamfilter_whitelist_edit.htm b/interface/web/mail/templates/spamfilter_whitelist_edit.htm
index 4887c441e2a25a3a614cf4bf683cd71a7d8b8d75..3ef8f5fb2ff43d393011f3dbb02c946bf83d1419 100644
--- a/interface/web/mail/templates/spamfilter_whitelist_edit.htm
+++ b/interface/web/mail/templates/spamfilter_whitelist_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_whitelist">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Whitelist</legend>
+    <fieldset class="inlineLabels">
 <!--
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>