- Add real SMTP error description to displayed error messages (#1485927)

43 files changed, 93 insertions, 88 deletions

diff --git a/CHANGELOG b/CHANGELOG
index f01e08986..077e744ae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Add real SMTP error description to displayed error messages (#1485927)
 - Fix some IMAP errors handling when opening the message (#1485443)
 - Fix related parts aren't displayed when got mimetype other than image/* (#1486432)
 - Multiple identity and database support for squirrelmail_usercopy plugin (#1486517)
diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index 4525502db..3c54d479c 100644
--- a/program/include/rcube_smtp.php
+++ b/program/include/rcube_smtp.php
@@ -196,7 +196,9 @@ class rcube_smtp
     // set From: address
     if (PEAR::isError($this->conn->mailFrom($from)))
     {
-      $this->error = array('label' => 'smtpfromerror', 'vars' => array('from' => $from, 'code' => $this->conn->_code));
+      $err = $this->conn->getResponse();
+      $this->error = array('label' => 'smtpfromerror', 'vars' => array(
+        'from' => $from, 'code' => $this->conn->_code, 'msg' => $err[1]));
       $this->response[] .= "Failed to set sender '$from'";
       $this->reset();
       return false;
@@ -215,7 +217,9 @@ class rcube_smtp
     foreach ($recipients as $recipient)
     {
       if (PEAR::isError($this->conn->rcptTo($recipient))) {
-        $this->error = array('label' => 'smtptoerror', 'vars' => array('to' => $recipient, 'code' => $this->conn->_code));
+        $err = $this->conn->getResponse();
+        $this->error = array('label' => 'smtptoerror', 'vars' => array(
+          'to' => $recipient, 'code' => $this->conn->_code, 'msg' => $err[1]));
         $this->response[] .= "Failed to add recipient '$recipient'";
         $this->reset();
         return false;
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index a2f56b41d..2e560f1fd 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -106,8 +106,8 @@ $messages['editorwarning'] = 'يتسبب الانتقال إلى محرر الن
 $messages['httpreceivedencrypterror'] = 'حدث خطأ جسيم في التهيئة. رجاءً اتصال بمدير الخادم حالاً. <b>لا يمكن إرسال بريدك.</b>';
 $messages['smtpconnerror'] = 'خطأ SMTP ($code): تعذر الاتصال بالخادم';
 $messages['smtpautherror'] = 'خطأ SMTP ($code): تعذر التحقق من هويتك';
-$messages['smtpfromerror'] = 'خطأ SMTP ($code): تعذر تحديد المرسل "$from"';
-$messages['smtptoerror'] = 'خطأ SMTP ($code): تعذرت إضافة المستلم "$to"';
+$messages['smtpfromerror'] = 'خطأ SMTP ($code): تعذر تحديد المرسل "$from" ($msg)';
+$messages['smtptoerror'] = 'خطأ SMTP ($code): تعذرت إضافة المستلم "$to" ($msg)';
 $messages['smtprecipientserror'] = 'خطأ SMTP: تعذرت قراءة قائمة المرسل إليهم';
 $messages['smtperror'] = 'خطأ SMTP: $msg';
 $messages['emailformaterror'] = 'عنوان بريد إلكتروني غير صالح: $email';
diff --git a/program/localization/ast/messages.inc b/program/localization/ast/messages.inc
index 5623a59fc..d37f32124 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -102,8 +102,8 @@ $messages['editorwarning'] = 'Si pases a editor en modu testu vas perder tol est
 $messages['httpreceivedencrypterror'] = 'Hai un fallu garrafal de configuración. Contauta col alministrador de secute. <b>Nun se pude unviar el mesaxe</b>';
 $messages['smtpconnerror'] = 'Fallu SMTP ($code): Fallu de conexón col sirvidor';
 $messages['smtpautherror'] = 'Fallu SMTP ($code): Fallu d\'autorización';
-$messages['smtpfromerror'] = 'Fallu SMTP ($code): Fallu al aficar el remitente "$from"';
-$messages['smtptoerror'] = 'Fallu SMTP ($code): Fallu al amestar el destinatariu "$to"';
+$messages['smtpfromerror'] = 'Fallu SMTP ($code): Fallu al aficar el remitente "$from" ($msg)';
+$messages['smtptoerror'] = 'Fallu SMTP ($code): Fallu al amestar el destinatariu "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Fallu SMTP: Nun soi a amosar la llista de destinatarios';
 $messages['smtperror'] = 'Fallu SMTP: $msg';
 
diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc
index d0a2019e2..a5180deb8 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -103,8 +103,8 @@ $messages['editorwarning'] = 'Превключването на редактор
 $messages['httpreceivedencrypterror'] = 'Фатална конфигурационна грешка. Моля, свържете се веднага с администратора. <b>Съобщението Ви не може да бъде изпратено.</b>';
 $messages['smtpconnerror'] = 'SMTP грешка ($code): Няма връзка със сървъра';
 $messages['smtpautherror'] = 'SMTP грешка ($code): Грешни потребител/парола';
-$messages['smtpfromerror'] = 'SMTP грешка ($code): Не може да бъде изпратено писмо от "$from"';
-$messages['smtptoerror'] = 'SMTP грешка ($code): Не може да бъде изпратено писмо до "$to"';
+$messages['smtpfromerror'] = 'SMTP грешка ($code): Не може да бъде изпратено писмо от "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP грешка ($code): Не може да бъде изпратено писмо до "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP грешка: Не може да бъде обработен списъка с получатели';
 $messages['smtperror'] = 'SMTP грешка: $msg';
 $messages['emailformaterror'] = 'Невалиден e-mail адрес: $email';
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index 3dbb2d7e5..594c45f1d 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -107,8 +107,8 @@ $messages['editorwarning'] = 'Si canvieu a l\'editor de text pla perdreu tot el
 $messages['httpreceivedencrypterror'] = 'Ha ocorregut un error fatal de configuració. Contacta amb el teu administrador inmediatament. <b>El teu missatge no pot ser enviat.</b>';
 $messages['smtpconnerror'] = 'Error SMTP ($code): La connexió al servidor ha fallat.';
 $messages['smtpautherror'] = 'Error SMTP ($code): Identificació fallida.';
-$messages['smtpfromerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$from" com a remitent';
-$messages['smtptoerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$to" com a destinatari';
+$messages['smtpfromerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$from" com a remitent ($msg)';
+$messages['smtptoerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$to" com a destinatari ($msg)';
 $messages['smtprecipientserror'] = 'Error SMTP: No s\'ha pogut analitzar la lista de destinataris';
 $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'Adreça d\'e-mail incorrecte: $email';
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index 9ea043f17..43d228e35 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -109,8 +109,8 @@ $messages['editorwarning'] = 'Přepnutím do režimu prostého textu ztratíte v
 $messages['httpreceivedencrypterror'] = 'Vyskytla se vážná chyba v konfiguraci. Kontaktujte neprodleně administátora. <b>Vaše zpráva nemohla být odeslána.</b>';
 $messages['smtpconnerror'] = 'Chyba SMTP ($code): Připojení k serveru selhalo';
 $messages['smtpautherror'] = 'Chyba SMTP ($code): Chyba přihlášení';
-$messages['smtpfromerror'] = 'Chyba SMTP ($code): Nelze nastavit odesílatele "$from"';
-$messages['smtptoerror'] = 'Chyba SMTP ($code): Nelze přidat příjemce "$to"';
+$messages['smtpfromerror'] = 'Chyba SMTP ($code): Nelze nastavit odesílatele "$from" ($msg)';
+$messages['smtptoerror'] = 'Chyba SMTP ($code): Nelze přidat příjemce "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Chyba SMTP: Nelze zpracovat seznam příjemců';
 $messages['smtperror'] = 'Chyba SMTP: $msg';
 $messages['emailformaterror'] = 'Neplatná e-mailová adresa: $email';
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index be9f1d341..a70c71eb3 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -103,8 +103,8 @@ $messages['editorwarning'] = 'Mi fydd newid i\'r golygydd testun plaen yn golygu
 $messages['httpreceivedencrypterror'] = 'Fe gafwyd gwall angheuol yn y ffurfweddiad. Cysylltwch â\'ch gweinyddwr ar unwaith. <b>Nid oedd yn bosib dangos eich neges.</b>';
 $messages['smtpconnerror'] = 'Gwall SMTP ($code): Methwyd cysylltu a\'r gweinydd';
 $messages['smtpautherror'] = 'Gwall SMTP ($code): Methwyd dilysu\'r cyfrif';
-$messages['smtpfromerror'] = 'Gwall SMTP ($code): Methwyd gosod y danfonwr "$from"';
-$messages['smtptoerror'] = 'Gwall SMTP ($code): Methwyd ychwanegu derbynwr "$to"';
+$messages['smtpfromerror'] = 'Gwall SMTP ($code): Methwyd gosod y danfonwr "$from" ($msg)';
+$messages['smtptoerror'] = 'Gwall SMTP ($code): Methwyd ychwanegu derbynwr "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Gwall SMTP: Nid oedd yn bosib darllen y rhestr o dderbynnwyr';
 $messages['smtperror'] = 'Gwall SMTP: $msg';
 $messages['emailformaterror'] = 'Cyfeiriad e-bost anghywir: $email';
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index f219c6504..3b9001287 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -107,8 +107,8 @@ $messages['editorwarning'] = 'Al formatering af teksten forsvinder, hvis der ski
 $messages['httpreceivedencrypterror'] = 'Der er opstået en fatal konfigurationsfejl. Kontakt venligst din system-administrator med det samme.<b>Din besked kunne ikke afsendes.</b>';
 $messages['smtpconnerror'] = 'SMTP fejl ($code): Forbindelsen til serveren afbrudt';
 $messages['smtpautherror'] = 'SMTP fejl ($code): Autenticering fejlede';
-$messages['smtpfromerror'] = 'SMTP fejl ($code): Kunne ikke afsende som "$from"';
-$messages['smtptoerror'] = 'SMTP fejl ($code): Kunne ikke tilføje modtageren "$to"';
+$messages['smtpfromerror'] = 'SMTP fejl ($code): Kunne ikke afsende som "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP fejl ($code): Kunne ikke tilføje modtageren "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP fejl: kan ikke fortolke listen af modtagere';
 $messages['smtperror'] = 'SMTP fejl: $msg';
 $messages['emailformaterror'] = 'Ugyldig email-adresse: $email';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index ca618691b..c17683efb 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -106,8 +106,8 @@ $messages['editorwarning'] = 'Beim Wechseln in den Texteditor gehen alle Textfor
 $messages['httpreceivedencrypterror'] = 'Ein gravierender Konfigurationsfehler ist aufgetreten. Kontaktieren Sie den Server-Administrator. <b>Die Nachricht wurde nicht gesendet!</b>';
 $messages['smtpconnerror'] = 'SMTP Fehler ($code): Die Verbindung ist fehlgeschlagen';
 $messages['smtpautherror'] = 'SMTP Fehler ($code): Die Authentisierung ist fehlgeschlagen';
-$messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender ("$from") konnte nicht gesetzt werden';
-$messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger ("$to") konnte nicht gesetzt werden';
+$messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender "$from" konnte nicht gesetzt werden ($msg)';
+$messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger "$to" konnte nicht gesetzt werden ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Fehler: Die Empfängerliste konnte nicht verarbeitet werden';
 $messages['smtperror'] = 'SMTP Fehler: $msg';
 $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email';
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index edd1a3802..a22225d86 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -106,8 +106,8 @@ $messages['editorwarning'] = 'Beim Wechseln in den Texteditor gehen alle Textfor
 $messages['httpreceivedencrypterror'] = 'Ein fataler Konfigurationsfehler ist aufgetreten. Kontaktieren Sie bitte sofort Ihren Administrator. <b>Ihre Nachricht konnte nicht versendet werden.</b>';
 $messages['smtpconnerror'] = 'SMTP Fehler ($code): Die Verbindung ist fehlgeschlagen';
 $messages['smtpautherror'] = 'SMTP Fehler ($code): Die Authentisierung ist fehlgeschlagen';
-$messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender ("$from") konnte nicht gesetzt werden';
-$messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger ("$to") konnte nicht gesetzt werden';
+$messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender "$from" konnte nicht gesetzt werden ($msg)';
+$messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger "$to" konnte nicht gesetzt werden ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Fehler: Die Empfängerliste konnte nicht verarbeitet werden';
 $messages['smtperror'] = 'SMTP Fehler: $msg';
 $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email';
diff --git a/program/localization/el_GR/messages.inc b/program/localization/el_GR/messages.inc
index 4664e5050..508b194af 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -99,8 +99,8 @@ $messages['nofromaddress'] = 'Στην επιλεγμένη ταυτότητα,
 $messages['httpreceivedencrypterror'] = 'Ούπς! Ανεπανόθωτο σφάλμα. Επικοινωνήστε με το διαχειριστή του εξυπηρετητή. <b>Το μηνυμά σας δεν στάλθηκε.</b>';
 $messages['smtpconnerror'] = 'Σφάλμα SMTP ($code): Απέτυχε η σύνδεση με τον εξυπηρετητή';
 $messages['smtpautherror'] = 'Σφάλμα SMTP ($code): Σφάλμα ταυτοποίησης';
-$messages['smtpfromerror'] = 'Σφάλμα SMTP ($code): Αποτυχία ορισμού αποστολέα "$from"';
-$messages['smtptoerror'] = 'Σφάλμα SMTP ($code): Αποτυχία προσθήκης παραλήπτη "$to"';
+$messages['smtpfromerror'] = 'Σφάλμα SMTP ($code): Αποτυχία ορισμού αποστολέα "$from" ($msg)';
+$messages['smtptoerror'] = 'Σφάλμα SMTP ($code): Αποτυχία προσθήκης παραλήπτη "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Σφάλμα SMTP: Αδύνατο να προσπελαστεί η λίστα παραληπτών';
 $messages['smtperror'] = 'Σφάλμα SMTP: $msg';
 $messages['emailformaterror'] = 'Λανθασμένη διεύθνση email: $email';
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index 9e4743e00..081ef6b84 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -106,8 +106,8 @@ $messages['editorwarning'] = 'Switching to the plain text editor will cause all
 $messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed';
 $messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from"';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to"';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Incorrect e-mail address: $email';
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index 9208bbde3..05077b9c7 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -106,8 +106,8 @@ $messages['editorwarning'] = 'Switching to the plain text editor will cause all
 $messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed';
 $messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from"';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to"';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Invalid e-mail address: $email';
diff --git a/program/localization/es_AR/messages.inc b/program/localization/es_AR/messages.inc
index 89f1fd327..96b9af7a0 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -109,8 +109,8 @@ $messages['editorwarning'] = 'Si cambia a texto plano se perderán todas las opc
 $messages['httpreceivedencrypterror'] = 'Ha ocurrido un error fatal de configuración. Contacte inmediatamente a su administrador. <b>Su mensaje no ha sido enviado.</b>';
 $messages['smtpconnerror'] = 'Error SMTP ($code): Conexión al servidor falló';
 $messages['smtpautherror'] = 'Error SMTP ($code): Falló la autentificación';
-$messages['smtpfromerror'] = 'Error SMTP ($code): No se pudo establecer el remitente "$from"';
-$messages['smtptoerror'] = 'Error SMTP ($code): No se puedo agregar el destinatario "$to"';
+$messages['smtpfromerror'] = 'Error SMTP ($code): No se pudo establecer el remitente "$from" ($msg)';
+$messages['smtptoerror'] = 'Error SMTP ($code): No se puedo agregar el destinatario "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Error SMTP: No se pudo leer la lista de destinatarios';
 $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'La dirección $email no es válida';
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 783ed36ab..84816ad0e 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -108,8 +108,8 @@ $messages['editorwarning'] = 'Cambiando a texto plano perderá el formato del me
 $messages['httpreceivedencrypterror'] = 'Ha ocurrido un error fatal de configuración. Contacte inmediatamente a su administrador. <b>Su mensaje no ha sido enviado.</b>';
 $messages['smtpconnerror'] = 'Error SMTP ($code): Ha fallado la conexión al servidor';
 $messages['smtpautherror'] = 'Error SMTP ($code): Error de autenticación';
-$messages['smtpfromerror'] = 'Error SMTP ($code): No se ha podido asignar el emisor "$from"';
-$messages['smtptoerror'] = 'Error SMTP ($code): No se ha podido establecer remitente "$to"';
+$messages['smtpfromerror'] = 'Error SMTP ($code): No se ha podido asignar el emisor "$from" ($msg)';
+$messages['smtptoerror'] = 'Error SMTP ($code): No se ha podido establecer remitente "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Error SMTP: No es posible analizar la lista de destinatarios';
 $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'Dirección e-mail incorrecta: $email';
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 23ec70e7c..27dad8972 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -107,8 +107,8 @@ $messages['editorwarning'] = 'Klaarteksti redaktorile lülitamine kaotab kogu te
 $messages['httpreceivedencrypterror'] = 'Viga seadistustes. Võta kohe oma süsteemiadministraatoriga ühendust. <b>Sinu kirja polnud võimalik ära saata.</b>';
 $messages['smtpconnerror'] = 'SMTP tõrge ($code): serveriga ühendumine nurjus';
 $messages['smtpautherror'] = 'SMTP tõrge ($code): autentimine nurjus';
-$messages['smtpfromerror'] = 'SMTP tõrge ($code): "$from" saatjaks määramine nurjus';
-$messages['smtptoerror'] = 'SMTP tõrge ($code): "$to" saajaks määramine nurjus';
+$messages['smtpfromerror'] = 'SMTP tõrge ($code): "$from" saatjaks määramine nurjus ($msg)';
+$messages['smtptoerror'] = 'SMTP tõrge ($code): "$to" saajaks määramine nurjus ($msg)';
 $messages['smtprecipientserror'] = 'SMTP tõrge: saajate nimekirja parsimine nurjus';
 $messages['smtperror'] = 'SMTP tõrge: $msg';
 $messages['emailformaterror'] = 'Lubamatu e-posti aadress: $email';
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index a9b4a0121..1790cf97d 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -107,8 +107,8 @@ $messages['editorwarning'] = 'Vaihtaminen tekstieditoriin aiheuttaa viestin muot
 $messages['httpreceivedencrypterror'] = 'Vakava virhe asetuksissa. Ota välittömästi yhteys ylläpitoon. <b>Viestiäsi ei voida lähettää.</b>';
 $messages['smtpconnerror'] = 'SMTP-virhe ($code): Palvelimelle yhdistäminen epäonnistui';
 $messages['smtpautherror'] = 'SMTP-virhe ($code): Tunnistus epäonnistui';
-$messages['smtpfromerror'] = 'SMTP-virhe ($code): Lähettäjän "$from" asettaminen epäonnistui';
-$messages['smtptoerror'] = 'SMTP-virhe ($code): Vastaanottajan "$to" lisääminen epäonnistui';
+$messages['smtpfromerror'] = 'SMTP-virhe ($code): Lähettäjän "$from" asettaminen epäonnistui ($msg)';
+$messages['smtptoerror'] = 'SMTP-virhe ($code): Vastaanottajan "$to" lisääminen epäonnistui ($msg)';
 $messages['smtprecipientserror'] = 'SMTP-virhe: Ei voida jäsentää vastaanottajien listaa';
 $messages['smtperror'] = 'SMTP-virhe: $msg';
 $messages['emailformaterror'] = 'Väärä sähköpostiosoite: $email';
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index 739aa95fa..0585686f0 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -108,8 +108,8 @@ $messages['editorwarning'] = 'Passer à l\'éditeur texte seul causera la perte
 $messages['httpreceivedencrypterror'] = 'Une erreur fatale de configuration est survenue. Veuillez contacter votre administrateur immédiatement. <b>Votre message n\'a pas pu être envoyé.</b>';
 $messages['smtpconnerror'] = 'Erreur SMTP ($code): Echec de la connexion au serveur';
 $messages['smtpautherror'] = 'Erreur SMTP ($code): Echec de l\'authentification';
-$messages['smtpfromerror'] = 'Erreur SMTP ($code): Impossible de définir l\'expéditeur "$from"';
-$messages['smtptoerror'] = 'Erreur SMTP ($code): Impossible d\'ajouter le destinataire "$to"';
+$messages['smtpfromerror'] = 'Erreur SMTP ($code): Impossible de définir l\'expéditeur "$from" ($msg)';
+$messages['smtptoerror'] = 'Erreur SMTP ($code): Impossible d\'ajouter le destinataire "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Erreur SMTP: Impossible de lire la liste des destinataires';
 $messages['smtperror'] = 'Erreur SMTP: $msg';
 $messages['emailformaterror'] = 'Adresse email incorrecte: $email';
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 00d92a48a..6f82ca1f3 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -103,8 +103,8 @@ $messages['editorwarning'] = 'Se troca neste intre ao editor de texto plano, vai
 $messages['httpreceivedencrypterror'] = 'Produciuse un erro fatal de configuración. Contacte ao administrador inmediatamente. <b>Non foi posible enviar a súa mensaxe.</b>';
 $messages['smtpconnerror'] = 'Erro SMTP ($code): Fallou a conexión co servidor';
 $messages['smtpautherror'] = 'Erro SMTP ($code): Fallou a autenticación';
-$messages['smtpfromerror'] = 'Erro SMTP ($code): Non foi posible establecer o remitente "$from"';
-$messages['smtptoerror'] = 'Erro SMTP ($code): Non foi posible engadir o destinatario "$to"';
+$messages['smtpfromerror'] = 'Erro SMTP ($code): Non foi posible establecer o remitente "$from" ($msg)';
+$messages['smtptoerror'] = 'Erro SMTP ($code): Non foi posible engadir o destinatario "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Erro SMTP: Non se pode analizar a lista de destinatarios';
 $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'O enderezo de correo electrónico é incorrecto: $email';
diff --git a/program/localization/hr_HR/messages.inc b/program/localization/hr_HR/messages.inc
index d33ae43fb..59d03bbb9 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -102,8 +102,8 @@ $messages['editorwarning'] = 'Prebacivanje u čisti tekstualni uređivač će pr
 $messages['httpreceivedencrypterror'] = 'Dogodila se fatalna greška u konfiguraciji. Odmah kontaktirajte administratora. <b>Vaša poruka se nemože poslati.</b>';
 $messages['smtpconnerror'] = 'SMTP Greška ($code): Veza na server nije uspjela';
 $messages['smtpautherror'] = 'SMTP Greška ($code): Autentikacija nije uspjela';
-$messages['smtpfromerror'] = 'SMTP Greška ($code): Nije uspjelo postavljanje pošiljatelja "$from"';
-$messages['smtptoerror'] = 'SMTP Greška ($code): Nije uspjelo dodavanje primatelja "$to"';
+$messages['smtpfromerror'] = 'SMTP Greška ($code): Nije uspjelo postavljanje pošiljatelja "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP Greška ($code): Nije uspjelo dodavanje primatelja "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Greška: Nije moguće pročitati listu primatelja';
 $messages['smtperror'] = 'SMTP Greška: $msg';
 $messages['emailformaterror'] = 'Nepravilna e-mail adresa: $email';
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index c865959d5..b806ff127 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -109,8 +109,8 @@ $messages['editorwarning'] = 'Az egyszerű szöveges formátumra való váltás
 $messages['httpreceivedencrypterror'] = 'Végzetes konfigurációs hiba történt, azonnal lépjen kapcsolatba az üzemeltetővel. <b>Az üzenet nem küldhető el.</b>';
 $messages['smtpconnerror'] = 'SMTP hiba ($code): Sikertelen kapcsolódás a szerverhez';
 $messages['smtpautherror'] = 'SMTP hiba ($code): Sikertelen bejelentkezés';
-$messages['smtpfromerror'] = 'SMTP hiba ($code): Nem sikerült a feladó beállítása: "$from"';
-$messages['smtptoerror'] = 'SMTP hiba ($code): Nem sikerült a következő címzett hozzáadása: "$to"';
+$messages['smtpfromerror'] = 'SMTP hiba ($code): Nem sikerült a feladó beállítása: "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP hiba ($code): Nem sikerült a következő címzett hozzáadása: "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP hiba ($code): A címzett lista feldolgozása sikertelen';
 $messages['smtperror'] = 'SMTP hiba ($code): $msg';
 $messages['emailformaterror'] = 'Helytelen formátumú e-mail cím: $email';
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index d20fd64e9..b21b77e82 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -100,8 +100,8 @@ $messages['editorwarning'] = 'Beralih pada editor teks murni akan mengakibatkan
 $messages['httpreceivedencrypterror'] = 'Terjadi sebuah kesalahan pengaturan. Segera hubungi administrator Anda. <b> Pesan Anda tidak bisa terkirim.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): Koneksi ke server gagal';
 $messages['smtpautherror'] = 'SMTP Error ($code): Otentifikasi gagal';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Gagal mengatur pengirim "$from"';
-$messages['smtptoerror'] = 'SMTP Error ($code): Gagal menambah penerima "$to"';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Gagal mengatur pengirim "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP Error ($code): Gagal menambah penerima "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error ($code): Tidak dapat menguraikan daftar penerima';
 $messages['smtperror'] = 'SMTP Error : $msg';
 
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index 88151754c..7450ae3a2 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -107,8 +107,8 @@ $messages['editorwarning'] = 'Passare all\'editor testuale farà perdere tutte l
 $messages['httpreceivedencrypterror'] = 'Fatale errore di configurazione. Per favore contatta l\'amministratore immediatamente. Il tuo messaggio non può essere inviato.';
 $messages['smtpconnerror'] = 'Errore SMTP ($code): Connessione al server fallita';
 $messages['smtpautherror'] = 'Errore SMTP ($code): Autenticazione fallita';
-$messages['smtpfromerror'] = 'Errore SMTP ($code): Fallita l\'impostazione del mittente "$from"';
-$messages['smtptoerror'] = 'Errore SMTP ($code): Fallito l\'inserimento del destinatario "$to"';
+$messages['smtpfromerror'] = 'Errore SMTP ($code): Fallita l\'impostazione del mittente "$from" ($msg)';
+$messages['smtptoerror'] = 'Errore SMTP ($code): Fallito l\'inserimento del destinatario "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Errore SMTP: Impossibile processare la lista dei destinatari';
 $messages['smtperror'] = 'Errore SMTP: $msg';
 $messages['emailformaterror'] = 'Indirizzo e-mail non corretto: $email';
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index 15271f253..64e4e39c5 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -107,8 +107,8 @@ $messages['editorwarning'] = 'テキストエディタに切り替えるとす�
 $messages['httpreceivedencrypterror'] = '致命的な設定エラーが発生しました。<b>メッセージは送信されませんでした。</b>システム管理者に至急連絡してください。';
 $messages['smtpconnerror'] = 'SMTP Error ($code): サーバーへの接続に失敗';
 $messages['smtpautherror'] = 'SMTP Error ($code): 認証に失敗';
-$messages['smtpfromerror'] = 'SMTP Error ($code): 差出人 "$from" を設定できません';
-$messages['smtptoerror'] = 'SMTP Error ($code): 宛先 "$to" を追加できません';
+$messages['smtpfromerror'] = 'SMTP Error ($code): 差出人 "$from" を設定できません ($msg)';
+$messages['smtptoerror'] = 'SMTP Error ($code): 宛先 "$to" を追加できません ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error: 宛先のリストを解析できません';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = '不正確なメールアドレスです: $email';
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index 12f0277e7..c02227e4a 100755
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -101,8 +101,8 @@ $messages['editorwarning'] = 'რედაქტორის გადართ�
 $messages['httpreceivedencrypterror'] = 'სერვერზე მოხდა შეცდომა. დაუყონებლივ დაუკავშირდით ადმინისტრატორს. <b>თქვენი შეტყობინება შესაძლოა ვერ გაიგზავნა.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): სერვერთან დაკავშირება ვერ მოხერხდა';
 $messages['smtpautherror'] = 'SMTP Error ($code): ავტორიზაციის შეცდომა';
-$messages['smtpfromerror'] = 'SMTP Error ($code): ვერ მიეთითა გამგზავნი "$from"';
-$messages['smtptoerror'] = 'SMTP Error ($code): ვერ დაემატა მიმღები "$to"';
+$messages['smtpfromerror'] = 'SMTP Error ($code): ვერ მიეთითა გამგზავნი "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP Error ($code): ვერ დაემატა მიმღები "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error: მიმღებთა ჩამონათვალის დამუშავება ვერ მოხერხდა';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'ელ-ფოსტის მისამართი არასწორია $email';
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index 3eeb9bf45..18bf0cbe7 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -107,8 +107,8 @@ $messages['editorwarning'] = 'Pereinant į grynojo teksto redagavimą, visas lai
 $messages['httpreceivedencrypterror'] = 'Įvyko lemtinga konfigūracijos klaida. Nedelsiant susisiekite su administratoriumi. <b>Jūsų laiškas negali būti išsiųstas.</b>';
 $messages['smtpconnerror'] = 'SMTP klaida ($code): nepavyko prisijungti prie serverio';
 $messages['smtpautherror'] = 'SMTP klaida ($code): nepavyko autentikuotis';
-$messages['smtpfromerror'] = 'SMTP klaida ($code): nepavyko nustatyti siuntėjo „$from“';
-$messages['smtptoerror'] = 'SMTP klaida ($code): nepavyko pridėti gavėjo „$to“';
+$messages['smtpfromerror'] = 'SMTP klaida ($code): nepavyko nustatyti siuntėjo „$from“ ($msg)';
+$messages['smtptoerror'] = 'SMTP klaida ($code): nepavyko pridėti gavėjo „$to“ ($msg)';
 $messages['smtprecipientserror'] = 'SMTP klaida: nepavyko apdoroti gavėjų sąrašo';
 $messages['smtperror'] = 'SMTP klaida: $msg';
 $messages['emailformaterror'] = 'Netinkamas el. pašto adresas: $email';
diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc
index 3f7558286..253c9b0bb 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -104,8 +104,8 @@ $messages['editorwarning'] = 'Pārslēdzoties uz vienkāršotu teksta redaktoru,
 $messages['httpreceivedencrypterror'] = 'Kļūme. Lūdzu sazinieties ar administratoru. <b>Nav iespējams nosūtīt vēstuli.</b>';
 $messages['smtpconnerror'] = 'SMTP kļūme ($code): Neizdevās pieslēgties serverim';
 $messages['smtpautherror'] = 'SMTP kļūme ($code): Neizdevās autentificēties';
-$messages['smtpfromerror'] = 'SMTP kļūme ($code): Neizdevās iestatīt sūtītāju "$from"';
-$messages['smtptoerror'] = 'SMTP kļūme ($code): Neizdevās pievienot saņēmēju "$to"';
+$messages['smtpfromerror'] = 'SMTP kļūme ($code): Neizdevās iestatīt sūtītāju "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP kļūme ($code): Neizdevās pievienot saņēmēju "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP kļūme: Nav iespējams parsēt saņēmēju sarakstu';
 $messages['smtperror'] = 'SMTP kļūme: $msg';
 $messages['emailformaterror'] = 'Nepareiza e-pasta adrese: $email';
diff --git a/program/localization/mk_MK/messages.inc b/program/localization/mk_MK/messages.inc
index 278403a67..7d1f60898 100755
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -2,7 +2,7 @@
 
 /*
 +-----------------------------------------------------------------------+
-| language/mk_MK/messages.inc                                              |
+| language/mk_MK/messages.inc                                           |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
 | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
@@ -101,8 +101,8 @@ $messages['editorwarning'] = 'Префрлањето на уредникот н�
 $messages['httpreceivedencrypterror'] = 'Се појави фатална конфигурациска грешка. Веднаш контактирајте го администраторот. <b>Вашето писмо не мож.</b>';
 $messages['smtpconnerror'] = 'SMTP грешка ($code): Не успеав да се поврзам со серверот';
 $messages['smtpautherror'] = 'SMTP грешка: Не успееа потврдувањето';
-$messages['smtpfromerror'] = 'SMTP грешка: Не успеав да го поставам испраќачот „$from"“';
-$messages['smtptoerror'] = 'SMTP грешка: Не успеав да го поставам примачот „$yo"“';
+$messages['smtpfromerror'] = 'SMTP грешка ($code): Не успеав да го поставам испраќачот „$from“ ($msg)';
+$messages['smtptoerror'] = 'SMTP грешка ($code): Не успеав да го поставам примачот „$yo“ ($msg)';
 $messages['smtprecipientserror'] = 'SMTP грешка: Не успеав да ја испарсирам листата на примачи';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Неправилна поштенска адреса: $email';
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index d2bb178e4..9b9b5f705 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -109,8 +109,8 @@ $messages['editorwarning'] = 'Ved å bytte for mat til ren tekst vil all tekstfo
 $messages['httpreceivedencrypterror'] = 'En uopprettelig feil oppsto. Vennligst kontakt systemansvarlig umiddelbart. <b>Din melding kunne ikke sendes.</b>';
 $messages['smtpconnerror'] = 'SMTP-feil ($code): Klarte ikke koble til server';
 $messages['smtpautherror'] = 'SMTP-feil ($code): Pålogging feilet';
-$messages['smtpfromerror'] = 'SMTP-feil ($code): Kunne ikke sette avsender "$from"';
-$messages['smtptoerror'] = 'SMTP-feil ($code): Kunne ikke legge til mottaker "$to"';
+$messages['smtpfromerror'] = 'SMTP-feil ($code): Kunne ikke sette avsender "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP-feil ($code): Kunne ikke legge til mottaker "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP-feil ($code): Kunne ikke lese mottakerliste';
 $messages['smtperror'] = 'SMTP-feil ($code): $msg';
 $messages['emailformaterror'] = 'Feil e-postadresse: $email';
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 33f2f5099..9c19947de 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -109,8 +109,8 @@ $messages['editorwarning'] = 'Door het overschakelen naar de platte tekst editor
 $messages['httpreceivedencrypterror'] = 'Er is een fatale fout opgetreden. Neem direct contact op met uw systeembeheerder. <b>Uw bericht kon niet worden verzonden.</b>';
 $messages['smtpconnerror'] = 'SMTP Fout ($code): Verbinding met server mislukt';
 $messages['smtpautherror'] = 'SMTP Fout ($code): Autenticatie mislukt';
-$messages['smtpfromerror'] = 'SMTP Fout ($code): Kon afzender "$from" niet instellen';
-$messages['smtptoerror'] = 'SMTP Fout ($code): Kon ontvanger "$to" niet toevoegen';
+$messages['smtpfromerror'] = 'SMTP Fout ($code): Kon afzender "$from" niet instellen ($msg)';
+$messages['smtptoerror'] = 'SMTP Fout ($code): Kon ontvanger "$to" niet toevoegen ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Fout: Kon lijst van ontvangers niet verwerken';
 $messages['smtperror'] = 'SMTP Fout: $msg';
 $messages['emailformaterror'] = 'Ongeldig e-mailadres: $email';
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index 727dab56d..82b220da3 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -107,8 +107,8 @@ $messages['editorwarning'] = 'Du mistar all formatering når du bytar til rein t
 $messages['httpreceivedencrypterror'] = 'Noko er totalt feilkonfigurert, send ein sint epost til administrator. No. <b>Meldinga di kunne ikkje bli sendt.</b>';
 $messages['smtpconnerror'] = 'SMTP-feil ($code): Tilkopling til tenar feila';
 $messages['smtpautherror'] = 'SMTP-feil ($code): Autentisering feila';
-$messages['smtpfromerror'] = 'SMTP-feil ($code): Feila å setja sendar «$from»';
-$messages['smtptoerror'] = 'SMTP-feil ($code): Feila å leggja til mottakar «$to»';
+$messages['smtpfromerror'] = 'SMTP-feil ($code): Feila å setja sendar «$from» ($msg)';
+$messages['smtptoerror'] = 'SMTP-feil ($code): Feila å leggja til mottakar «$to» ($msg)';
 $messages['smtprecipientserror'] = 'SMTP-feil: Eg forstår ikkje mottakarlista (sjå over han...)';
 $messages['smtperror'] = 'SMTP-feil: $msg';
 $messages['emailformaterror'] = 'Ukorrekt e-postadresse: $email';
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index 094acaa42..17ee13c0c 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -111,8 +111,8 @@ $messages['editorwarning'] = 'Zmiana edytora spowoduje utratę formatowania teks
 $messages['httpreceivedencrypterror'] = 'Wystąpił błąd krytyczny. Skontaktuj się z administratorem. <b>Nie można wysłać wiadomości.</b>';
 $messages['smtpconnerror'] = 'Błąd SMTP ($code): Nie można nawiązać połączenia z serwerem';
 $messages['smtpautherror'] = 'Błąd SMTP ($code): Uwierzytelnianie nie powiodło się';
-$messages['smtpfromerror'] = 'Błąd SMTP ($code): Nie można ustawić nadawcy "$from"';
-$messages['smtptoerror'] = 'Błąd SMTP ($code): Nie można dodać odbiorcy "$to"';
+$messages['smtpfromerror'] = 'Błąd SMTP ($code): Nie można ustawić nadawcy "$from" ($msg)';
+$messages['smtptoerror'] = 'Błąd SMTP ($code): Nie można dodać odbiorcy "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Błąd SMTP: Parsowanie listy odbiorców nie powiodło się';
 $messages['smtperror'] = 'Błąd SMTP: $msg';
 $messages['emailformaterror'] = 'Błędny adres e-mail: $email';
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index 59f9007ba..74dbb882d 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -111,8 +111,8 @@ $messages['editorwarning'] = 'Mudar para o editor de texto simples elimina toda
 $messages['httpreceivedencrypterror'] = 'Ocorreu um erro de configuração. Informe ao administrador do sistema imediatamente. <b>Sua mensagem não pode ser enviada.</b>';
 $messages['smtpconnerror'] = 'Erro SMTP ($code): Conexão ao servidor falhou';
 $messages['smtpautherror'] = 'Erro SMTP ($code): Falha na autenticação';
-$messages['smtpfromerror'] = 'Erro SMTP ($code): Falha ao definir o remetente "$from"';
-$messages['smtptoerror'] = 'Erro SMTP ($code): Falha ao adicionar o destinatário "$to"';
+$messages['smtpfromerror'] = 'Erro SMTP ($code): Falha ao definir o remetente "$from" ($msg)';
+$messages['smtptoerror'] = 'Erro SMTP ($code): Falha ao adicionar o destinatário "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Erro SMTP: Não é possível analisar a lista destinatários';
 $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'Endereço de Email incorreto: $email';
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index f5db48554..1c0f0bbd1 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -105,8 +105,8 @@ $messages['editorwarning'] = 'Ao mudar para o editor plain text vai perder toda
 $messages['httpreceivedencrypterror'] = 'Ocorreu um erro fatal de configuração. Contacte o seu administrador imediatamente. <b>A sua mensagem não pôde ser enviada.</b>';
 $messages['smtpconnerror'] = 'Erro SMTP ($code): Ligação ao servidor falhou';
 $messages['smtpautherror'] = 'Erro SMTP ($code): Autenticação falhou';
-$messages['smtpfromerror'] = 'Erro SMTP ($code): Falhou a definir remetente "$from"';
-$messages['smtptoerror'] = 'Erro SMTP ($code): Falhou ao adicionar destinatário: "$to"';
+$messages['smtpfromerror'] = 'Erro SMTP ($code): Falhou a definir remetente "$from" ($msg)';
+$messages['smtptoerror'] = 'Erro SMTP ($code): Falhou ao adicionar destinatário: "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Erro SMTP: Impossível analisar lista de destinatários';
 $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'Endereço de e-mail incorrecto: $email';
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index 7d092a51a..3ddc1223e 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -105,10 +105,10 @@ $messages['opnotpermitted'] = 'Operaţia nu este permisă!';
 $messages['nofromaddress'] = 'Nu există o adresă de e-mail în identitatea selectată';
 $messages['editorwarning'] = 'Trecerea în mod text a editorului va cauza pierderea formatării textului. Doriţi să continuaţi?';
 $messages['httpreceivedencrypterror'] = 'Vă rugăm să luaţi legătura cu administratorul serverului de mail, deoarece există o eroare în configuraţia acestuia. Mesajul d-voastră nu a fost trimis.';
-$messages['smtpconnerror'] = 'Eroare SMTP  ($code): Conexiunea cu serverul a eşuat';
-$messages['smtpautherror'] = 'Eroare SMTP  ($code): Autentificare eşuată';
-$messages['smtpfromerror'] = 'Eroare SMTP  ($code): Nu s-a putut seta expeditorul "$from"';
-$messages['smtptoerror'] = 'Eroare SMTP  ($code): Nu s-a putut adăuga destinatarul "$to"';
+$messages['smtpconnerror'] = 'Eroare SMTP ($code): Conexiunea cu serverul a eşuat';
+$messages['smtpautherror'] = 'Eroare SMTP ($code): Autentificare eşuată';
+$messages['smtpfromerror'] = 'Eroare SMTP ($code): Nu s-a putut seta expeditorul "$from" ($msg)';
+$messages['smtptoerror'] = 'Eroare SMTP ($code): Nu s-a putut adăuga destinatarul "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Eroare SMTP: Nu s-a putut procesa lista cu destinatari';
 $messages['smtperror'] = 'Eroare SMTP: $msg';
 $messages['emailformaterror'] = 'Adresă de e-mail incorectă: $email';
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index 485bc5303..6e0468ba5 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -106,8 +106,8 @@ $messages['editorwarning'] = 'При переключении в редакто�
 $messages['httpreceivedencrypterror'] = 'На сервере возникла неизбежная ошибка. Срочно свяжитесь с Вашим администратором. <b>Ваше сообщение может быть не отправлено.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): Соединение с сервером сброшено';
 $messages['smtpautherror'] = 'SMTP Error ($code): Ошибка авторизации';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Невозможно установить отправителя "$from"';
-$messages['smtptoerror'] = 'SMTP Error ($code): Невозможно добавить получателя "$to"';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Невозможно установить отправителя "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP Error ($code): Невозможно добавить получателя "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error ($code): Невозможно обработать список получателей';
 $messages['smtperror'] = 'SMTP Error ($code): $msg';
 $messages['emailformaterror'] = 'Неверный адрес: $email';
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index 1e132737b..859a144f6 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -109,8 +109,8 @@ $messages['editorwarning'] = 'Prepnutie na editor obyčajného textu spôsobí s
 $messages['httpreceivedencrypterror'] = 'Vyskytla sa vážna chyba v konfigurácii. Kontaktujte bezodkladne administrátora. <b>Vaša správa nemohla byť odoslaná.</b>';
 $messages['smtpconnerror'] = 'Chyba SMTP: Pripojenie na server zlyhalo';
 $messages['smtpautherror'] = 'Chyba SMTP: Autorizácie zlyhala';
-$messages['smtpfromerror'] = 'Chyba SMTP: Nemožno nastaviť odosielateľa';
-$messages['smtptoerror'] = 'Chyba SMTP: Nemožno pridať príjemca';
+$messages['smtpfromerror'] = 'Chyba SMTP: Nemožno nastaviť odosielateľa ($msg)';
+$messages['smtptoerror'] = 'Chyba SMTP: Nemožno pridať príjemca ($msg)';
 $messages['smtprecipientserror'] = 'Chyba SMTP: Nemožno spracovať zoznam príjemcov';
 $messages['smtperror'] = 'Chyba SMTP: $msg';
 $messages['emailformaterror'] = 'Neplatná e-mailová adresa: $email';
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index 755383c9f..bdd64e937 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -2,7 +2,7 @@
 
 /*
 +-----------------------------------------------------------------------+
-| language/sl_SL/messages.inc                                          |
+| language/sl_SL/messages.inc                                           |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
 | Copyright (C) 2008-2010, RoundQube Dev. - Switzerland                 |
@@ -103,8 +103,8 @@ $messages['editorwarning'] = 'Preklop v splošen urejevalnik onemogoča uporabo
 $messages['httpreceivedencrypterror'] = 'Prišlo je do večje napake v konfiguraciji.Obrnite se na skrbnika sistema.  <b>Sporočila ni bilo mogoče poslati.</b>';
 $messages['smtpconnerror'] = 'Napaka pri pošiljanju ($code): Povezava s strežnikom je spodletela';
 $messages['smtpautherror'] = 'Napaka pri pošiljanju($code): Avtentikacija je spodletela';
-$messages['smtpfromerror'] = 'Napaka pri pošiljanju ($code): Neveljaven elektronski naslov pošiljatelja "$from"';
-$messages['smtptoerror'] = 'Napaka pri pošiljanju ($code): Neveljaven elektronski naslov prejemnika "$to"';
+$messages['smtpfromerror'] = 'Napaka pri pošiljanju ($code): Neveljaven elektronski naslov pošiljatelja "$from" ($msg)';
+$messages['smtptoerror'] = 'Napaka pri pošiljanju ($code): Neveljaven elektronski naslov prejemnika "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Napaka pri pošiljanju: Seznama prejemnikov ni bilo mogoče razčleniti';
 $messages['smtperror'] = 'Napaka pri pošiljanju:$msg';
 $messages['emailformaterror'] = 'Nepravilen elektronski naslov: $email';
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 290b5fff4..9f9a4260a 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -108,8 +108,8 @@ $messages['editorwarning'] = 'Genom att växla till text-läge går formateringe
 $messages['httpreceivedencrypterror'] = 'Ett irreparabelt fel har uppstått. Kontakta administratören omgående. <b>Meddelandet kan inte skickas.</b>';
 $messages['smtpconnerror'] = 'SMTP-fel ($code): Anslutning till servern misslyckades';
 $messages['smtpautherror'] = 'SMTP-fel ($code): Inloggningen misslyckades';
-$messages['smtpfromerror'] = 'SMTP-fel ($code): Kan inte sätta avsändaradress till "$from"';
-$messages['smtptoerror'] = 'SMTP-fel ($code): Kan inte lägga till mottagaradress "$to"';
+$messages['smtpfromerror'] = 'SMTP-fel ($code): Kan inte sätta avsändaradress till "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP-fel ($code): Kan inte lägga till mottagaradress "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP-fel: Felaktigt formaterad lista med mottagaradresser';
 $messages['smtperror'] = 'SMTP-fel: $msg';
 $messages['emailformaterror'] = 'Felaktig adress: $email';
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index 1fad83c28..c22e95ed6 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -103,8 +103,8 @@ $messages['editorwarning'] = 'Düz metin düzenleyiciye geçmek, metin üzerinde
 $messages['httpreceivedencrypterror'] = 'Ayarlarda bir hata oluştu. Sistem yöneticinize haber verin. <b>Postanız gönderilemedi</b>';
 $messages['smtpconnerror'] = 'SMTP Hatası ($code): Sunucuya bağlanılamadı';
 $messages['smtpautherror'] = 'SMTP Hatası ($code): Kimlik doğrulama başarısız oldu';
-$messages['smtpfromerror'] = 'SMTP Hatası ($code): Gönderen adresi "$from" olarak ayarlanamadı';
-$messages['smtptoerror'] = 'SMTP Hatası ($code): "$to" alıcısı eklenemedi';
+$messages['smtpfromerror'] = 'SMTP Hatası ($code): Gönderen adresi "$from" olarak ayarlanamadı ($msg)';
+$messages['smtptoerror'] = 'SMTP Hatası ($code): "$to" alıcısı eklenemedi ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Hatası: Posta alıcılarının listesi ayrıştırılamadı';
 $messages['smtperror'] = 'SMTP Hatası: $msg';
 $messages['emailformaterror'] = 'Hatalı e-posta adresi: $email';
diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc
index 1f23ae842..0b10f7109 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -106,8 +106,8 @@ $messages['editorwarning'] = 'Перемикання в режим звичай�
 $messages['httpreceivedencrypterror'] = 'Помилка конфігурації. Негайно зверніться до адміністратора. <b>Ваше повідомлення не буде відправлено.</b>';
 $messages['smtpconnerror'] = 'Помилка SMTP-сервера ($code): Не вдалося з\'єднатися з сервером';
 $messages['smtpautherror'] = 'Помилка SMTP-сервера ($code): Невдала спроба автентифікації';
-$messages['smtpfromerror'] = 'Помилка SMTP-сервера ($code): Не вдалося вказати відправника "$from"';
-$messages['smtptoerror'] = 'Помилка SMTP-сервера ($code): Не вдалося додати отримувача "$to"';
+$messages['smtpfromerror'] = 'Помилка SMTP-сервера ($code): Не вдалося вказати відправника "$from" ($msg)';
+$messages['smtptoerror'] = 'Помилка SMTP-сервера ($code): Не вдалося додати отримувача "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error: Не вдалося обробити список отримувачів';
 $messages['smtperror'] = 'Помилка SMTP-сервера: $msg';
 $messages['emailformaterror'] = 'Невірна електронна адреса: $email';
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index 48dff1fbe..0a2d74628 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -104,8 +104,8 @@ $messages['editorwarning'] = '切換到純文字編輯模式將會遺失所有�
 $messages['httpreceivedencrypterror'] = '發生嚴重錯誤。請立即聯絡管理者。<b>您的郵件無法送出。</b>';
 $messages['smtpconnerror'] = 'SMTP 錯誤（$code）：與伺服器連線失敗';
 $messages['smtpautherror'] = 'SMTP 錯誤（$code）：認證失敗';
-$messages['smtpfromerror'] = 'SMTP 錯誤（$code）：無法設寄建者「$from」';
-$messages['smtptoerror'] = 'SMTP 錯誤（$code）：無法加收件者「$to」';
+$messages['smtpfromerror'] = 'SMTP 錯誤（$code）：無法設寄建者「$from」（$msg）';
+$messages['smtptoerror'] = 'SMTP 錯誤（$code）：無法加收件者「$to」（$msg）';
 $messages['smtprecipientserror'] = 'SMTP 錯誤：無法分析收件者';
 $messages['smtperror'] = 'SMTP 錯誤：$msg';
 $messages['emailformaterror'] = '錯誤電子郵件：$email';