diff --git a/interface/web/mailuser/index.php b/interface/web/mailuser/index.php
index 0b1a0f59fc31787cf51c09f4334cc0842d688b08..aba8eaa09d8856fbf7165d9392a20ef84c75ecfb 100644
--- a/interface/web/mailuser/index.php
+++ b/interface/web/mailuser/index.php
@@ -30,6 +30,11 @@ if($rec['cc'] == '') $rec['cc'] = $wb['none_txt'];
 
 $app->tpl->setVar($rec);
 
+$sql2 = "SELECT * FROM server WHERE server_id = ".$rec['server_id'];
+$rec2 = $app->db->queryOneRecord($sql2);
+
+$app->tpl->setVar($rec2);
+
 $app->tpl->setVar('msg',$msg);
 $app->tpl->setVar('error',$error);
 
@@ -38,6 +43,4 @@ $app->tpl->setVar('error',$error);
 
 $app->tpl_defaults();
 $app->tpl->pparse();
-
-
 ?>
\ No newline at end of file
diff --git a/interface/web/mailuser/lib/lang/de_index.lng b/interface/web/mailuser/lib/lang/de_index.lng
index 2bd11d81de53ec282f5d06d688dde6d4baea98fb..1a4590c57849c4fcef6ef7968a3d0e5fd258014f 100644
--- a/interface/web/mailuser/lib/lang/de_index.lng
+++ b/interface/web/mailuser/lib/lang/de_index.lng
@@ -3,7 +3,8 @@ $wb["page_head_txt"] = 'Mailbox-Einstellungen';
 $wb["page_desc_txt"] = 'Hier können Sie die Einstellungen des E-Mail-Kontos ändern.';
 $wb["email_txt"] = 'E-Mail-Adresse';
 $wb["login_txt"] = 'Login';
-$wb["cc_txt"] = 'Kopie senden an';
+$wb["server_address_txt"] = 'Mailserver-Adresse';
+$wb["cc_txt"] = 'Kopie senden an (CC)';
 $wb["quota_txt"] = 'Mailbox-Größe';
 $wb["unlimited_txt"] = 'Unlimitiert';
 $wb["mb_txt"] = 'MB';
diff --git a/interface/web/mailuser/lib/lang/en_index.lng b/interface/web/mailuser/lib/lang/en_index.lng
index 1b60c2aef3fdbf4f02cbd2edc0a57e731903a0a8..35c6aae8efa5f5cc98d59f4c4f7fc440c6995a5f 100644
--- a/interface/web/mailuser/lib/lang/en_index.lng
+++ b/interface/web/mailuser/lib/lang/en_index.lng
@@ -3,7 +3,8 @@ $wb["page_head_txt"] = 'Mailbox settings';
 $wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
 $wb["email_txt"] = 'Email address';
 $wb["login_txt"] = 'Login';
-$wb["cc_txt"] = 'Send copy to';
+$wb["server_address_txt"] = 'Mailserver address';
+$wb["cc_txt"] = 'Send copy to (CC)';
 $wb["quota_txt"] = 'Mailbox size';
 $wb["unlimited_txt"] = 'Unlimited';
 $wb["mb_txt"] = 'MB';
diff --git a/interface/web/mailuser/templates/index.htm b/interface/web/mailuser/templates/index.htm
index 352e9464edb24a37813dbaf972c3bbc5227cc722..c320253e161093c39327f39b01cd15270000ca78 100644
--- a/interface/web/mailuser/templates/index.htm
+++ b/interface/web/mailuser/templates/index.htm
@@ -6,20 +6,24 @@
   <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'}
+            <p class="label">{tmpl_var name='email_txt'}</p>
+            <p class="value">{tmpl_var name='email'}</p>
         </div>
         <div class="ctrlHolder">
-            <label for="password"><b>{tmpl_var name='login_txt'}</b></label>
-            {tmpl_var name='login'}
+            <p class="label">{tmpl_var name='login_txt'}</p>
+            <p class="value">{tmpl_var name='login'}</p>
         </div>
         <div class="ctrlHolder">
-            <label for="password"><b>{tmpl_var name='quota_txt'}</b></label>
-            {tmpl_var name='quota'}
+            <p class="label">{tmpl_var name='server_address_txt'}</p>
+            <p class="value">{tmpl_var name='server_name'}</p>
         </div>
         <div class="ctrlHolder">
-            <label for="password"><b>{tmpl_var name='cc_txt'}</b></label>
-            {tmpl_var name='cc'}
+            <p class="label">{tmpl_var name='quota_txt'}</p>
+            <p class="value">{tmpl_var name='quota'}</p>
+        </div>
+        <div class="ctrlHolder">
+            <p class="label">{tmpl_var name='cc_txt'}</p>
+            <p class="value">{tmpl_var name='cc'}</p>
         </div>
         <div class="buttonHolder buttons">
             &nbsp;