diff --git a/interface/web/mailuser/lib/lang/de.lng b/interface/web/mailuser/lib/lang/de.lng
index ae6485875ad69f0ab8e61c64bf48578b353fba6d..7136f5590836e99a87c4c02b4c459820df264eb8 100644
--- a/interface/web/mailuser/lib/lang/de.lng
+++ b/interface/web/mailuser/lib/lang/de.lng
@@ -1,5 +1,6 @@
 <?php
 $wb["Email Account"] = 'E-Mail-Konto';
+$wb["Overview"] = 'Übersicht';
 $wb["Password"] = 'Passwort';
 $wb["Autoresponder"] = 'Autoresponder';
 $wb["Send copy"] = 'Kopie senden an';
diff --git a/interface/web/mailuser/lib/lang/en.lng b/interface/web/mailuser/lib/lang/en.lng
index de454200088c127ab5b94575534a60d068cf077e..5b711141e59a4cde0a6f72f13ce5a8a28bbc9eb8 100644
--- a/interface/web/mailuser/lib/lang/en.lng
+++ b/interface/web/mailuser/lib/lang/en.lng
@@ -1,5 +1,6 @@
 <?php
 $wb["Email Account"] = 'Email Account';
+$wb["Overview"] = 'Overview';
 $wb["Password"] = 'Password';
 $wb["Autoresponder"] = 'Autoresponder';
 $wb["Send copy"] = 'Send copy';
diff --git a/interface/web/mailuser/lib/module.conf.php b/interface/web/mailuser/lib/module.conf.php
index 52ca679e87408db8ef412e31715355aa1127671d..b6084aabf40d8105ad2f241341eba58ef32375ae 100644
--- a/interface/web/mailuser/lib/module.conf.php
+++ b/interface/web/mailuser/lib/module.conf.php
@@ -12,43 +12,41 @@ $module['tab_width']            = '';
 //**** menu
 $items = array();
 
-$items[] = array( 	'title' 	=> 'Overview',
-					'target' 	=> 'content',
-					'link'	=> 'mailuser/index.php',
-					'html_id' => 'mail_user_index');
+$items[] = array( 	'title'     => 'Overview',
+                        'target'    => 'content',
+                        'link'      => 'mailuser/index.php',
+                        'html_id'   => 'mail_user_index');
 
-$items[] = array( 	'title' 	=> 'Password',
-					'target' 	=> 'content',
-					'link'	=> 'mailuser/mail_user_password_edit.php',
-					'html_id' => 'mail_user_password');
+$items[] = array( 	'title'     => 'Password',
+                        'target'    => 'content',
+                        'link'      => 'mailuser/mail_user_password_edit.php',
+                        'html_id'   => 'mail_user_password');
 
-$items[] = array( 	'title' 	=> 'Autoresponder',
-					'target' 	=> 'content',
-					'link'	=> 'mailuser/mail_user_autoresponder_edit.php',
-					'html_id' => 'mail_user_autoresponder');
+$items[] = array( 	'title'     => 'Autoresponder',
+                        'target'    => 'content',
+                        'link'      => 'mailuser/mail_user_autoresponder_edit.php',
+                        'html_id'   => 'mail_user_autoresponder');
 
-$items[] = array( 	'title' 	=> 'Send copy',
-					'target' 	=> 'content',
-					'link'	=> 'mailuser/mail_user_cc_edit.php',
-					'html_id' => 'mail_user_cc');
+$items[] = array( 	'title'     => 'Send copy',
+                        'target'    => 'content',
+                        'link'      => 'mailuser/mail_user_cc_edit.php',
+                        'html_id'   => 'mail_user_cc');
 
-$items[] = array( 	'title' 	=> 'Spamfilter',
-					'target' 	=> 'content',
-					'link'	=> 'mailuser/mail_user_spamfilter_edit.php',
-					'html_id' => 'mail_user_cc');
+$items[] = array( 	'title'     => 'Spamfilter',
+                        'target'    => 'content',
+                        'link'      => 'mailuser/mail_user_spamfilter_edit.php',
+                        'html_id'   => 'mail_user_cc');
 
-$items[] = array( 	'title' 	=> 'Email Filters',
-					'target' 	=> 'content',
-					'link'	=> 'mailuser/mail_user_filter_list.php',
-					'html_id' => 'mail_user_filter_list');
+$items[] = array( 	'title'     => 'Email Filters',
+                        'target'    => 'content',
+                        'link'      => 'mailuser/mail_user_filter_list.php',
+                        'html_id'   => 'mail_user_filter_list');
 
 
 if(count($items)) {
-	$module['nav'][] = array(	'title'	=> 'Email Account',
-								'open' 	=> 1,
-								'items'	=> $items);
+	$module['nav'][] = array(   'title' => 'Email Account',
+                                    'open'  => 1,
+                                    'items' => $items);
 }
 
-
-
 ?>
\ 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 e9c81f45b4bf5d70f6136d178671e3e51301e8d6..089f82430118f643b6bbd063d27b2a51027a683a 100644
--- a/interface/web/mailuser/templates/mail_user_cc_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_cc_edit.htm
@@ -6,8 +6,8 @@
     <div class="pnl_formsarea">
         <fieldset class="inlineLabels">
             <div class="ctrlHolder">
-                <label for="password">{tmpl_var name='email_txt'}</label>
-                {tmpl_var name='email'}
+                <p class="label">{tmpl_var name='email_txt'}</p>
+                <p class="value">{tmpl_var name='email'}</p>
             </div>
             <div class="ctrlHolder">
                 <label for="name">{tmpl_var name='cc_txt'}</label>
diff --git a/interface/web/mailuser/templates/mail_user_password_edit.htm b/interface/web/mailuser/templates/mail_user_password_edit.htm
index a947ff1c6604109e356362cddba8e5ac7f01d7d4..2b91842c80b013b91e9cd16db2b0811424ad924d 100644
--- a/interface/web/mailuser/templates/mail_user_password_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_password_edit.htm
@@ -6,8 +6,8 @@
     <div class="pnl_formsarea">
         <fieldset class="inlineLabels">
             <div class="ctrlHolder">
-                <label for="password">{tmpl_var name='email_txt'}</label>
-                {tmpl_var name='email'}
+                <p class="label">{tmpl_var name='email_txt'}</p>
+                <p class="value">{tmpl_var name='email'}</p>
             </div>
             <div class="ctrlHolder">
                 <label for="password">{tmpl_var name='password_txt'}</label>
diff --git a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
index 26b0e4b7938e9eb870d7924efa2b2f959b54fb5e..eaa59e9503697b3c7b54fe011a8db724ad1134fc 100644
--- a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
@@ -6,8 +6,8 @@
     <div class="pnl_formsarea">
         <fieldset class="inlineLabels">
             <div class="ctrlHolder">
-                <label for="password">{tmpl_var name='email_txt'}</label>
-                {tmpl_var name='email'}
+                <p class="label">{tmpl_var name='email_txt'}</p>
+                <p class="value">{tmpl_var name='email'}</p>
             </div>
             <div class="ctrlHolder">
                 <label for="policy">{tmpl_var name='policy_txt'}</label>