diff --git a/emailadmin/inc/class.emailadmin_wizard.inc.php b/emailadmin/inc/class.emailadmin_wizard.inc.php
index 4130d36b1d..81fff441f4 100644
--- a/emailadmin/inc/class.emailadmin_wizard.inc.php
+++ b/emailadmin/inc/class.emailadmin_wizard.inc.php
@@ -1149,32 +1149,16 @@ class emailadmin_wizard
 					$sel_options['acc_folder_junk'] = $sel_options['notify_folders'] =
 						self::mailboxes(self::imap_client ($content));
 			}
-			// call wizard, if we have a connection error: Horde_Imap_Client_Exception
-			catch(Horde_Imap_Client_Exception $e) {
-				_egw_log_exception($e);
-				// if we are not comming from wizard --> try it
-				if (!$content['output'])
-				{
-					return $this->add($content, $e->getMessage(), 'error');
-				}
-				// we already been in wizard, wont get better, let admin try fixing it
-				egw_framework::message($e->getMessage(), 'error');
+			catch(Exception $e) {
+				// let user know what the problem is and that he can fix it using wizard or deleting
+				$msg = lang($e->getMessage())."\n\n".lang('You can use wizard to fix account settings or delete account.');
+				$msg_type = 'error';
 				// cant connection to imap --> allow free entries in taglists
-				foreach(array('acc_folder_sent', 'acc_folder_trash', 'acc_folder_draft', 'acc_folder_template') as $folder)
+				foreach(array('acc_folder_sent', 'acc_folder_trash', 'acc_folder_draft', 'acc_folder_template', 'acc_folder_junk') as $folder)
 				{
 					$tpl->setElementAttribute($folder, 'allowFreeEntries', true);
 				}
 			}
-			// call wizard, if we have missing credentials: InvalidArgumentException
-			catch(InvalidArgumentException $e) {
-				_egw_log_exception($e);
-				return $this->add($content, $e->getMessage());
-			}
-			// and for the rest also ...
-			catch(Exception $e) {
-				_egw_log_exception($e);
-				return $this->add($content, $e->getMessage().' ('.get_class($e).': '.$e->getCode().')');
-			}
 		}
 		$sel_options['acc_imap_type'] = emailadmin_base::getIMAPServerTypes(false);
 		$sel_options['acc_smtp_type'] = emailadmin_base::getSMTPServerTypes(false);
diff --git a/emailadmin/lang/egw_de.lang b/emailadmin/lang/egw_de.lang
index a39d25588f..0e2cd6c5d2 100644
--- a/emailadmin/lang/egw_de.lang
+++ b/emailadmin/lang/egw_de.lang
@@ -202,6 +202,7 @@ vacation messages with start- and end-date require an admin account to be set	em
 virtual mail manager	emailadmin	de	Virtual MAIL ManaGeR
 yes, use credentials below only for alarms and notifications, otherwise use credentials of current user	emailadmin	de	Ja, die Daten darunter nur für Alarme und Benachrichtigungen verwenden, ansonsten die Daten des aktiven Benutzers.
 yes, use credentials of current user or if given credentials below	emailadmin	de	Ja, benutze Daten des aktuellen Benutzers oder wenn angegeben die Daten darunter
+you can use wizard to fix account settings or delete account.	emailadmin	de	Sie können jetzt den Wizard verwenden um die Konteneinstellungen zu ändern oder das Konto löschen.
 you have received a new message on the	emailadmin	de	Sie haben eine neue Nachricht erhalten.
 you need to specify a forwarding address, when checking "%1"!	emailadmin	de	Sie müssen eine Weiterleitungsadresse angeben, wenn "%1" abgehackt ist!
 your message to  %1 was displayed.	emailadmin	de	Ihre Nachricht %1 wurde angezeigt
diff --git a/emailadmin/lang/egw_en.lang b/emailadmin/lang/egw_en.lang
index 019ca41b78..4dacd3b9ac 100755
--- a/emailadmin/lang/egw_en.lang
+++ b/emailadmin/lang/egw_en.lang
@@ -202,6 +202,7 @@ vacation messages with start- and end-date require an admin account to be set	em
 virtual mail manager	emailadmin	en	Virtual MAIL ManaGeR
 yes, use credentials below only for alarms and notifications, otherwise use credentials of current user	emailadmin	en	Yes, use credentials below only for alarms and notifications, otherwise use credentials of current user
 yes, use credentials of current user or if given credentials below	emailadmin	en	Yes, use credentials of current user or if given credentials below
+you can use wizard to fix account settings or delete account.	emailadmin	en	You can use wizard to fix account settings or delete account.
 you have received a new message on the	emailadmin	en	You have received a new message on the
 you need to specify a forwarding address, when checking "%1"!	emailadmin	en	You need to specify a forwarding address, when checking "%1"!
 your message to  %1 was displayed.	emailadmin	en	Your message to  %1 was displayed.