diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h
index a0522560a..d1029b138 100644
--- a/src/core/abstract/MCMessageConstants.h
+++ b/src/core/abstract/MCMessageConstants.h
@@ -253,8 +253,8 @@ namespace mailcore {
         ErrorServerDate,
         ErrorNoValidServerFound,
         ErrorCustomCommand,
-        ErrorSendMessageSpamSuspected,
-        ErrorSendMessageDailyLimitExceeded
+        ErrorYahooSendMessageSpamSuspected,
+        ErrorYahooSendMessageDailyLimitExceeded
     };
     
     enum PartType {
diff --git a/src/core/smtp/MCSMTPSession.cpp b/src/core/smtp/MCSMTPSession.cpp
index e6f4207bb..2693737df 100644
--- a/src/core/smtp/MCSMTPSession.cpp
+++ b/src/core/smtp/MCSMTPSession.cpp
@@ -682,12 +682,12 @@ void SMTPSession::sendMessage(Address * from, Array * recipients, Data * message
                 goto err;
             }
         }
-        else if (responseCode == 521 && response->locationOfString(MCSTR("limit")) != -1) {
-            * pError = ErrorSendMessageDailyLimitExceeded;
+        else if (responseCode == 521 && response->locationOfString(MCSTR("over the limit")) != -1) {
+            * pError = ErrorYahooSendMessageDailyLimitExceeded;
             goto err;
         }
         else if (responseCode == 554 && response->locationOfString(MCSTR("spam")) != -1) {
-            * pError = ErrorSendMessageSpamSuspected;
+            * pError = ErrorYahooSendMessageSpamSuspected;
             goto err;
         }
         
diff --git a/src/objc/abstract/MCOConstants.h b/src/objc/abstract/MCOConstants.h
index ac87ba28d..419d8485a 100644
--- a/src/objc/abstract/MCOConstants.h
+++ b/src/objc/abstract/MCOConstants.h
@@ -414,9 +414,9 @@ typedef NS_ENUM(NSInteger, MCOErrorCode) {
     /** Error while running custom command */
     MCOErrorCustomCommand,
     /** Spam was suspected by server */
-    MCOErrorSendMessageSpamSuspected,
+    MCOErrorYahooSendMessageSpamSuspected,
     /** Daily limit of sent messages was hit */
-    MCOErrorSendMessageDailyLimitExceeded,
+    MCOErrorYahooSendMessageDailyLimitExceeded,
     /** The count of all errors */
     MCOErrorCodeCount,
 };