diff --git a/interface/web/mailuser/templates/index.htm b/interface/web/mailuser/templates/index.htm
index 2ae24bffe87e9ccfd541e8877a0fb2c53ead0d3c..352e9464edb24a37813dbaf972c3bbc5227cc722 100644
--- a/interface/web/mailuser/templates/index.htm
+++ b/interface/web/mailuser/templates/index.htm
@@ -1,32 +1,30 @@
 <h2><tmpl_var name="page_head_txt"></h2>
 <p><tmpl_var name="page_desc_txt"></p>
 
-<div class="panel panel_mail_user">
+<div class="panel panel_mailuser">
 
   <div class="pnl_formsarea">
     <fieldset class="inlineLabels">
-      <div class="ctrlHolder">
-      	<label for="password"><b>{tmpl_var name='email_txt'}</b></label>
-        {tmpl_var name='email'}
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="password"><b>{tmpl_var name='login_txt'}</b></label>
-        {tmpl_var name='login'}
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="password"><b>{tmpl_var name='quota_txt'}</b></label>
-        {tmpl_var name='quota'}
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="password"><b>{tmpl_var name='cc_txt'}</b></label>
-        {tmpl_var name='cc'}
-	  </div>
-	  <div class="buttonHolder buttons">
-			&nbsp;
-		</div>
+        <div class="ctrlHolder">
+            <label for="password"><b>{tmpl_var name='email_txt'}</b></label>
+            {tmpl_var name='email'}
+        </div>
+        <div class="ctrlHolder">
+            <label for="password"><b>{tmpl_var name='login_txt'}</b></label>
+            {tmpl_var name='login'}
+        </div>
+        <div class="ctrlHolder">
+            <label for="password"><b>{tmpl_var name='quota_txt'}</b></label>
+            {tmpl_var name='quota'}
+        </div>
+        <div class="ctrlHolder">
+            <label for="password"><b>{tmpl_var name='cc_txt'}</b></label>
+            {tmpl_var name='cc'}
+        </div>
+        <div class="buttonHolder buttons">
+            &nbsp;
+        </div>
     </fieldset>
-
- 
   </div>
   
-</div>
+</div>
\ No newline at end of file
diff --git a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm
index dd24a2b7802a68c1d1a8fab16294b3353b2fbc16..271fca1035758bac6c97258d5e47c6202ed71ca8 100644
--- a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm
@@ -1,42 +1,37 @@
 <h2><tmpl_var name="list_head_txt"></h2>
 <p><tmpl_var name="list_desc_txt"></p>
 
-<div class="panel panel_mail_user">
-	<div class="pnl_formsarea">
-		<fieldset class="inlineLabels">
-			<div class="ctrlHolder">
-				<label for="autoresponder_subject">{tmpl_var name='autoresponder_subject_txt'}</label>
-				<input type="text" name="autoresponder_subject" id="autoresponder_subject" maxlength='250' value="{tmpl_var name='autoresponder_subject'}" />
-			</div>
-			<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>
-			</div>
-			<div class="ctrlHolder">
-				<label for="autoresponder">{tmpl_var name='autoresponder_active'}</label>
-				<input type="checkbox" value="y" id="autoresponder" name="autoresponder"
-					onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />
-			</div>
-			<div class="ctrlHolder">
-				<label for="autoresponder_start_date">{tmpl_var name='autoresponder_start_date_txt'}</label>
-				{tmpl_var name='autoresponder_start_date'}&nbsp;
-				<a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a>
-			</div>
-			<div class="ctrlHolder">
-				<label for="autoresponder_end_date">{tmpl_var name='autoresponder_end_date_txt'}</label>
-				{tmpl_var name='autoresponder_end_date'}
-			</div>
-		</fieldset>
-		<input type="hidden" name="id" value="{tmpl_var name='id'}">
-		<div class="buttonHolder buttons">
-			<button class="positive iconstxt icoPositive" type="button"
-				value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_autoresponder_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('mailuser/index.php');">
-				<span>{tmpl_var name='btn_cancel_txt'}</span>
-			</button>
-		</div>
-	</div>
-</div>
+<div class="panel panel_mailuser_autoresponder">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="autoresponder_subject">{tmpl_var name='autoresponder_subject_txt'}</label>
+                <input type="text" name="autoresponder_subject" id="autoresponder_subject" maxlength='250' value="{tmpl_var name='autoresponder_subject'}" />
+            </div>
+            <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>
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder">{tmpl_var name='autoresponder_active'}</label>
+                <input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_start_date">{tmpl_var name='autoresponder_start_date_txt'}</label>
+                {tmpl_var name='autoresponder_start_date'}&nbsp;
+                <a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_end_date">{tmpl_var name='autoresponder_end_date_txt'}</label>
+                {tmpl_var name='autoresponder_end_date'}
+            </div>
+        </fieldset>
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_autoresponder_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('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/mailuser/templates/mail_user_cc_edit.htm b/interface/web/mailuser/templates/mail_user_cc_edit.htm
index 228330445491fbf49bc1b1e4c415aa09003a4f3f..e9c81f45b4bf5d70f6136d178671e3e51301e8d6 100644
--- a/interface/web/mailuser/templates/mail_user_cc_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_cc_edit.htm
@@ -1,26 +1,26 @@
 <h2><tmpl_var name="list_head_txt"></h2>
 <p><tmpl_var name="list_desc_txt"></p>
 
-<div class="panel panel_mail_user">
+<div class="panel panel_mailuser_cc">
 
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels">
-      <div class="ctrlHolder">
-      	<label for="password">{tmpl_var name='email_txt'}</label>
-        {tmpl_var name='email'}
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="name">{tmpl_var name='cc_txt'}</label>
-        <input name="cc" id="cc" value="{tmpl_var name='cc'}" size="30" maxlength="255" type="text" class="textInput" /> &nbsp; {tmpl_var name='name_optional_txt'}
-	  </div>
-    </fieldset>
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='email_txt'}</label>
+                {tmpl_var name='email'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='cc_txt'}</label>
+                <input name="cc" id="cc" value="{tmpl_var name='cc'}" size="30" maxlength="255" type="text" class="textInput" /> &nbsp; {tmpl_var name='name_optional_txt'}
+            </div>
+        </fieldset>
 
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_cc_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('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_cc_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('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
     </div>
-  </div>
   
-</div>
+</div>
\ No newline at end of file
diff --git a/interface/web/mailuser/templates/mail_user_filter_edit.htm b/interface/web/mailuser/templates/mail_user_filter_edit.htm
index 2ff0c726695d45beb8a52c5ddad541b01f55114d..a9113c2f65023ce72a958183795316dd32d6b08e 100644
--- a/interface/web/mailuser/templates/mail_user_filter_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_filter_edit.htm
@@ -1,38 +1,38 @@
 <h2><tmpl_var name="list_head_txt"></h2>
 <p><tmpl_var name="list_desc_txt"></p>
 
-<div class="panel panel_mail_user_filter">
+<div class="panel panel_mailuser_filter">
 
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels">
-      <div class="ctrlHolder">
-        <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"  class="textInput">
-      </div>
-      <div class="ctrlHolder">
-        <label for="source" class="wf_preField">{tmpl_var name='source_txt'}</label>
-        <select id="source" name="source"  class="textInput formLengthHalf">{tmpl_var name='source'}</select>
-        <select id="op" name="op"  class="textInput formLengthHalf">{tmpl_var name='op'}</select>
-        <input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" size="30" maxlength="255"  class="textInput">
-      </div>
-      <div class="ctrlHolder">
-        <label for="action" class="wf_preField">{tmpl_var name='action_txt'}</label>
-        <select id="action" name="action" class="textInput formLengthHalf">{tmpl_var name='action'}</select>
-        <input type="text" id="target" name="target" value="{tmpl_var name='target'}" size="30" maxlength="255"  class="textInput formLengthHalf">
-      </div>
-      <div class="ctrlHolder">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
-        <span class="">{tmpl_var name='active'}</span>
-      </div>
-    </fieldset>
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <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"  class="textInput">
+            </div>
+            <div class="ctrlHolder">
+                <label for="source" class="wf_preField">{tmpl_var name='source_txt'}</label>
+                <select id="source" name="source"  class="textInput formLengthHalf">{tmpl_var name='source'}</select>
+                <select id="op" name="op"  class="textInput formLengthHalf">{tmpl_var name='op'}</select>
+                <input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" size="30" maxlength="255"  class="textInput">
+            </div>
+            <div class="ctrlHolder">
+                <label for="action" class="wf_preField">{tmpl_var name='action_txt'}</label>
+                <select id="action" name="action" class="textInput formLengthHalf">{tmpl_var name='action'}</select>
+                <input type="text" id="target" name="target" value="{tmpl_var name='target'}" size="30" maxlength="255"  class="textInput formLengthHalf">
+            </div>
+            <div class="ctrlHolder">
+                <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+                <span class="">{tmpl_var name='active'}</span>
+            </div>
+        </fieldset>
 
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-    <input name="mailuser_id" type="hidden" value="{tmpl_var name='mailuser_id'}">
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input name="mailuser_id" type="hidden" value="{tmpl_var name='mailuser_id'}">
 
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_filter_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('mailuser/mail_user_filter_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_filter_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('mailuser/mail_user_filter_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
     </div>
-  </div>
   
-</div>
+</div>
\ No newline at end of file
diff --git a/interface/web/mailuser/templates/mail_user_filter_list.htm b/interface/web/mailuser/templates/mail_user_filter_list.htm
index 66450581d466ca6a96c63e68777f18edff177dd8..b8501e8ddee0d579964fcfbe93acb752db795a0e 100644
--- a/interface/web/mailuser/templates/mail_user_filter_list.htm
+++ b/interface/web/mailuser/templates/mail_user_filter_list.htm
@@ -1,5 +1,7 @@
 <h2><tmpl_var name="list_head_txt"></h2>
 
+<div class="panel panel_list_mailuser_filter">
+    
   <div class="pnl_toolsarea">
     <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
       <div class="buttons">
@@ -10,37 +12,39 @@
     </fieldset>
   </div>
 
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_rulename"><a href="#" onClick="loadContent('mailuser/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mailuser/mail_user_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                <tr>
+                    <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
+                    <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                    <td class="tbl_col_rulename"><a href="#" onClick="loadContent('mailuser/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
+                    <td class="tbl_col_buttons">
+                    <div class="buttons icons16">    
+                        <a class="icons16 icoDelete" href="javascript: del_record('mailuser/mail_user_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                    </div>
+                    </td>
+                </tr>
+                </tmpl_loop>
+                </tbody>
 
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
+                <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/mailuser/templates/mail_user_password_edit.htm b/interface/web/mailuser/templates/mail_user_password_edit.htm
index ed1d7ce757e8555d4315cb90c0ab122a082a88b4..a947ff1c6604109e356362cddba8e5ac7f01d7d4 100644
--- a/interface/web/mailuser/templates/mail_user_password_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_password_edit.htm
@@ -1,37 +1,37 @@
 <h2><tmpl_var name="list_head_txt"></h2>
 <p><tmpl_var name="list_desc_txt"></p>
 
-<div class="panel panel_mail_user">
+<div class="panel panel_mailuser_password">
 
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels">
-      <div class="ctrlHolder">
-      	<label for="password">{tmpl_var name='email_txt'}</label>
-        {tmpl_var name='email'}
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="password">{tmpl_var name='password_txt'}</label>
-        <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
-	  </div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='password_strength_txt'}</p>
-				<div id="passBar"></div>
-				<p class="formHint"><span id="passText">&nbsp;</span></p>
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
-        <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
-		</div>
-		<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
-		<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
-    </fieldset>
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='email_txt'}</label>
+                {tmpl_var name='email'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+        </fieldset>
 
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_password_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('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_password_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('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
     </div>
-  </div>
-  
-</div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
index c5f638008d8b6d90cddf8fa70bb0e61bfd651672..26b0e4b7938e9eb870d7924efa2b2f959b54fb5e 100644
--- a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
@@ -1,28 +1,28 @@
 <h2><tmpl_var name="list_head_txt"></h2>
 <p><tmpl_var name="list_desc_txt"></p>
 
-<div class="panel panel_mail_user">
+<div class="panel panel_mailuser_spamfilter">
 
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels">
-      <div class="ctrlHolder">
-      	<label for="password">{tmpl_var name='email_txt'}</label>
-        {tmpl_var name='email'}
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="policy">{tmpl_var name='policy_txt'}</label>
-        <select name="policy" id="policy" class="selectInput">
-					{tmpl_var name='policy'}
-				</select>
-			</div>
-    </fieldset>
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='email_txt'}</label>
+                {tmpl_var name='email'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="policy">{tmpl_var name='policy_txt'}</label>
+                <select name="policy" id="policy" class="selectInput">
+                    {tmpl_var name='policy'}
+                </select>
+            </div>
+        </fieldset>
 
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_spamfilter_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('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_spamfilter_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('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
     </div>
-  </div>
-  
-</div>
+    
+</div>
\ No newline at end of file