diff --git a/admin/inc/class.admin_mail.inc.php b/admin/inc/class.admin_mail.inc.php
index 42b57e7b51..7227aedcc5 100644
--- a/admin/inc/class.admin_mail.inc.php
+++ b/admin/inc/class.admin_mail.inc.php
@@ -1052,8 +1052,13 @@ class admin_mail
 							$account = new Mail\Account($content);
 							if ($account->acc_imap_administration)
 							{
-								$imap = $account->imapServer(true);
-								if ($imap) $imap->checkAdminConnection();
+								try {
+									$imap = $account->imapServer(true);
+									if ($imap) $imap->checkAdminConnection();
+								}
+								catch(\Horde_Imap_Client_Exception $e) {
+									Api\Json\Response::get()->message(lang('Checking admin credentials failed').': '.$e->getMessage(), 'info');
+								}
 							}
 							// test sieve connection, if not called for other user, enabled and credentials available
 							if (!$content['called_for'] && $account->acc_sieve_enabled && $account->acc_imap_username)
diff --git a/admin/templates/default/mailaccount.xet b/admin/templates/default/mailaccount.xet
index ded8ef51d8..5d29f9f330 100644
--- a/admin/templates/default/mailaccount.xet
+++ b/admin/templates/default/mailaccount.xet
@@ -47,9 +47,9 @@
 		<grid width="100%">
 			<columns>
 				<column width="115"/>
-				<column width="200"/>
+				<column width="40%"/>
 				<column width="60"/>
-				<column/>
+				<column width="30%"/>
 			</columns>
 			<rows>
 				<row class="emailadmin_no_single">
diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang
index 3049e5f920..74a771eb10 100644
--- a/mail/lang/egw_de.lang
+++ b/mail/lang/egw_de.lang
@@ -100,6 +100,7 @@ check to receive a notification when the message is read (note: not all clients
 check to save as calendar event on send	mail	de	Nach dem Versenden als Termin erstellen
 check to save as infolog on send	mail	de	Nach dem Versenden als InfoLog erstellen
 check to save as tracker entry on send	mail	de	Nach dem Versenden als Ticket erstellen
+checking admin credentials failed	mail	de	Überprüfung der Admin-Zugangsdaten fehlgeschlagen
 choose file	mail	de	Datei
 common acl	mail	de	Berechtigung
 compose	mail	de	Verfassen
diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang
index c6d811be7c..14bf0d5504 100644
--- a/mail/lang/egw_en.lang
+++ b/mail/lang/egw_en.lang
@@ -100,6 +100,7 @@ check to receive a notification when the message is read (note: not all clients
 check to save as calendar event on send	mail	en	Check button to create as event after sending
 check to save as infolog on send	mail	en	Check button to create as InfoLog after sending
 check to save as tracker entry on send	mail	en	Check button to create as ticket after sending
+checking admin credentials failed	mail	en	Checking admin credentials failed
 choose file	mail	en	Choose file
 common acl	mail	en	Common access rights
 compose	mail	en	Compose