diff --git a/web/css/styles.min.css b/web/css/styles.min.css
index a3b3212e7..67ed2c4bd 100644
--- a/web/css/styles.min.css
+++ b/web/css/styles.min.css
@@ -2826,6 +2826,10 @@ a.button.cancel {
   padding: 7px 5px 12px 20px;
   margin-top: 17px;
   width: 334px;
+  overflow: hidden;
+}
+.mail-infoblock:hover {
+  overflow: visible;
 }
 .mail-infoblock td {
   color: #777;
@@ -2836,6 +2840,10 @@ a.button.cancel {
 .mail-infoblock td:first-child{
   padding-right: 15px;
 }
+.mail-infoblock div {
+  width: 190px;
+  white-space: nowrap;
+}
 
 .additional-info {
     margin-left: 30px;
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index 28602626d..5e0096466 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -146,43 +146,43 @@
                         </tr>
                         <tr>
                             <td><?=__('Username')?>:</td>
-                            <td><span id="v_account">william.cage</span>@<?=htmlentities($v_domain)?></td>
+                            <td><div><span id="v_account">william.cage</span>@<?=htmlentities($v_domain)?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('Password')?>:</td>
-                            <td id="v_password">******</td>
+                            <td><div id="v_password">******</div></td>
                         </tr>
                         <tr>
                             <td><?=__('IMAP hostname')?>:</td>
-                            <td id="td_imap_hostname"><?=$hostname?></td>
+                            <td><div id="td_imap_hostname"><?=$hostname?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('IMAP port')?>:</td>
-                            <td id="td_imap_port">143</td>
+                            <td><div id="td_imap_port">143</div></td>
                         </tr>
                         <tr>
                             <td><?=__('IMAP security')?>:</td>
-                            <td id="td_imap_encryption"><?=__('STARTTLS')?></td>
+                            <td><div id="td_imap_encryption"><?=__('STARTTLS')?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('IMAP auth method')?>:</td>
-                            <td><?=__('Normal password')?></td>
+                            <td><div><?=__('Normal password')?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('SMTP hostname')?></td>
-                            <td id="td_smtp_hostname"><?=$hostname?></td>
+                            <td><div id="td_smtp_hostname"><?=$hostname?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('SMTP port')?>:</td>
-                            <td id="td_smtp_port">587</td>
+                            <td><div id="td_smtp_port">587</div></td>
                         </tr>
                         <tr>
                             <td><?=__('SMTP security')?>:</td>
-                            <td id="td_smtp_encryption"><?=__('STARTTLS')?></td>
+                            <td><div id="td_smtp_encryption"><?=__('STARTTLS')?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('SMTP auth method')?>:</td>
-                            <td><?=__('Normal password')?></td>
+                            <td><div><?=__('Normal password')?></div></td>
                         </tr>
                     </table>
                 </div>
diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html
index 66ee7b6d9..20a286f95 100644
--- a/web/templates/admin/edit_mail_acc.html
+++ b/web/templates/admin/edit_mail_acc.html
@@ -155,43 +155,43 @@
                         </tr>
                         <tr>
                             <td><?=__('Username')?>:</td>
-                            <td><span id="v_account">william.cage</span>@<?=htmlentities($v_domain)?></td>
+                            <td><div><span id="v_account">william.cage</span>@<?=htmlentities($v_domain)?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('Password')?>:</td>
-                            <td id="v_password">******</td>
+                            <td><div id="v_password">******</div></td>
                         </tr>
                         <tr>
                             <td><?=__('IMAP hostname')?>:</td>
-                            <td><?=$hostname?></td>
+                            <td><div id="td_imap_hostname"><?=$hostname?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('IMAP port')?>:</td>
-                            <td>143</td>
+                            <td><div id="td_imap_port">143</div></td>
                         </tr>
                         <tr>
                             <td><?=__('IMAP security')?>:</td>
-                            <td><?=__('STARTTLS')?></td>
+                            <td><div id="td_imap_encryption"><?=__('STARTTLS')?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('IMAP auth method')?>:</td>
-                            <td><?=__('Normal password')?></td>
+                            <td><div><?=__('Normal password')?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('SMTP hostname')?></td>
-                            <td><?=$hostname?></td>
+                            <td><div id="td_smtp_hostname"><?=$hostname?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('SMTP port')?>:</td>
-                            <td>587</td>
+                            <td><div id="td_smtp_port">587</div></td>
                         </tr>
                         <tr>
                             <td><?=__('SMTP security')?>:</td>
-                            <td><?=__('STARTTLS')?></td>
+                            <td><div id="td_smtp_encription"><?=__('STARTTLS')?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('SMTP auth method')?>:</td>
-                            <td><?=__('Normal password')?></td>
+                            <td><div><?=__('Normal password')?></div></td>
                         </tr>
                     </table>
                 </div>