3 files changed, 8 insertions, 1 deletions
diff --git a/src/core/abstract/MCErrorMessage.cpp b/src/core/abstract/MCErrorMessage.cpp
index d6b11a29..1ed4aa2d 100644
--- a/src/core/abstract/MCErrorMessage.cpp
+++ b/src/core/abstract/MCErrorMessage.cpp
@@ -50,6 +50,7 @@ static const char * localizedDescriptionTable[] = {
     "Cannot send message due to possible spam detected by server",                   /** MCOErrorSendMessageSpamSuspected */
     "User is over the limit for messages allowed to be sent in a single day",        /** MCOErrorSendMessageDailyLimitExceeded */
     "The user needs to log in via the web browser",                                  /** MCOErrorOutlookLoginViaWebBrowser */
+    "Credentials with password too simple",                                          /** MCOErrorTiscaliSimplePassword */
 };
 
 String * mailcore::errorMessageWithErrorCode(ErrorCode errorCode)
diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h
index 9cb98b30..58822df9 100644
--- a/src/core/abstract/MCMessageConstants.h
+++ b/src/core/abstract/MCMessageConstants.h
@@ -258,6 +258,7 @@ namespace mailcore {
         ErrorYahooSendMessageSpamSuspected,
         ErrorYahooSendMessageDailyLimitExceeded,
         ErrorOutlookLoginViaWebBrowser,
+        ErrorTiscaliSimplePassword,
     };
     
     enum PartType {
diff --git a/src/core/smtp/MCSMTPSession.cpp b/src/core/smtp/MCSMTPSession.cpp
index 4875d3b4..29df6460 100644
--- a/src/core/smtp/MCSMTPSession.cpp
+++ b/src/core/smtp/MCSMTPSession.cpp
@@ -644,7 +644,12 @@ void SMTPSession::login(ErrorCode * pError)
         return;
     }
     else if (r != MAILSMTP_NO_ERROR) {
-        * pError = ErrorAuthentication;
+        if(mSmtp->response_code == 535
+           && strstr(mSmtp->response_buffer->str, "your password is too simple") != NULL) {
+            * pError = ErrorTiscaliSimplePassword;
+        } else {
+            * pError = ErrorAuthentication;
+        }
         return;
     }