1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/smtp/MCSMTPSession.cpp b/src/core/smtp/MCSMTPSession.cpp
index 0c2016fd..e6f4207b 100644
--- a/src/core/smtp/MCSMTPSession.cpp
+++ b/src/core/smtp/MCSMTPSession.cpp
@@ -682,6 +682,14 @@ void SMTPSession::sendMessage(Address * from, Array * recipients, Data * message
                 goto err;
             }
         }
+        else if (responseCode == 521 && response->locationOfString(MCSTR("limit")) != -1) {
+            * pError = ErrorSendMessageDailyLimitExceeded;
+            goto err;
+        }
+        else if (responseCode == 554 && response->locationOfString(MCSTR("spam")) != -1) {
+            * pError = ErrorSendMessageSpamSuspected;
+            goto err;
+        }
         
         * pError = ErrorSendMessage;
         MC_SAFE_REPLACE_COPY(String, mLastSMTPResponse, response);