diff --git a/web/css/styles.min.css b/web/css/styles.min.css
index b106f314..8dc1af5a 100644
--- a/web/css/styles.min.css
+++ b/web/css/styles.min.css
@@ -2808,7 +2808,7 @@ a.button.cancel {
   vertical-align: top;
 }
 .mail-infoblock {
-  padding-top: 76px;
+  padding-top: 80px;
   margin-left: -100px;
   font-size: 12px;
   color: #777;
@@ -2816,11 +2816,26 @@ a.button.cancel {
 .mail-infoblock td {
   color: #777;
   font-size: 14px;
-  height: 20px;
+  height: 18px;
   padding-right: 25px;
   font-weight: normal;
 }
 
+.additional-info {
+    margin-left: 30px;
+    margin-top: 30px;
+    width: 547px;
+}
+.additional-info td {
+    font-size: 12px;
+    height: 22px;
+    font-weight: normal;
+}
+.additional-info td.details {
+    padding-left: 20px;
+}
+
+
 
 :focus {outline:none;}
 ::-moz-focus-inner {border:0;}
diff --git a/web/js/pages/edit_mail_acc.js b/web/js/pages/edit_mail_acc.js
index 43220c71..3d1399d1 100644
--- a/web/js/pages/edit_mail_acc.js
+++ b/web/js/pages/edit_mail_acc.js
@@ -86,6 +86,11 @@ randomString = function() {
         randomstring += chars.substr(rnum, 1);
     }
     document.v_edit_mail_acc.v_password.value = randomstring;
+
+    if($('input[name=v_password]').attr('type') == 'text')
+        $('#v_password').text(randomstring);
+    else
+        $('#v_password').text(Array(randomstring.length+1).join('*'));
 }
 
 $(document).ready(function() {
diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html
index b3746db5..d37731d7 100644
--- a/web/templates/admin/edit_mail_acc.html
+++ b/web/templates/admin/edit_mail_acc.html
@@ -137,6 +137,55 @@
                         </tr>
                     </table>
                 </td>
+
+            <td class="mail-infoblock-td">
+                <div class="mail-infoblock">
+                <table>
+                    <?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
+                    <tr>
+                        <td><?=__('Username')?>:</td>
+                        <td><span id="v_account">william.cage</span>@<?=htmlentities($v_domain)?></td>
+                    </tr>
+                    <tr>
+                        <td><?=__('Password')?>:</td>
+                        <td id="v_password">******</td>
+                    </tr>
+                    <tr>
+                        <td><?=__('IMAP hostname')?>:</td>
+                        <td><?=$hostname?></td>
+                    </tr>
+                    <tr>
+                        <td><?=__('IMAP port')?>:</td>
+                        <td>143</td>
+                    </tr>
+                    <tr>
+                        <td><?=__('IMAP security')?>:</td>
+                        <td><?=__('STARTTLS')?></td>
+                    </tr>
+                    <tr>
+                        <td><?=__('IMAP auth method')?>:</td>
+                        <td><?=__('Normal password')?></td>
+                    </tr>
+                    <tr>
+                        <td><?=__('SMTP hostname')?></td>
+                        <td><?=$hostname?></td>
+                    </tr>
+                    <tr>
+                        <td><?=__('SMTP port')?>:</td>
+                        <td>587</td>
+                    </tr>
+                    <tr>
+                        <td><?=__('SMTP security')?>:</td>
+                        <td><?=__('STARTTLS')?></td>
+                    </tr>
+                    <tr>
+                        <td><?=__('SMTP auth method')?>:</td>
+                        <td><?=__('Normal password')?></td>
+                    </tr>
+                </table>
+                </div>
+            </td>
+
             </tr>
         </table>
     </form>