diff --git a/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties b/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties
index a7e0bd9652e..94c65b7932d 100644
--- a/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties
@@ -82,9 +82,6 @@
 ## @name NS_ERROR_SENDING_FROM_COMMAND
 12514=An error occurred while sending mail. The mail server responded:  %s.  Please verify that your email address is correct in your Mail preferences and try again.
 
-## @name NS_ERROR_SENDING_RCPT_COMMAND
-12515=An error occurred while sending mail. The mail server responded:  %s. Please check the message recipients and try again.
-
 ## @name NS_ERROR_SENDING_DATA_COMMAND
 12516=An (SMTP) error occurred while sending mail. The server responded:  %s.
 
@@ -253,6 +250,9 @@ sendAnyway=Send anyway
 ## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER_WITH_STARTTLS2
 12574=An error occurred sending mail: Unable to connect to SMTP server %S via STARTTLS since it doesn't offer STARTTLS In EHLO reponse. Please verify that your Mail/News account settings are correct and try again.
 
+## @name NS_ERROR_SENDING_RCPT_COMMAND
+12575=An error occurred while sending mail. The mail server responded:  %1$s. Please check the message recipient %2$s and try again.
+
 ## Strings use for the save message dialog shown when the user close a message compose window
 saveDlogTitle=Save Message
 saveDlogMessage=Message has not been sent. Do you want to save the message in the Drafts folder?
diff --git a/mailnews/compose/src/nsComposeStrings.h b/mailnews/compose/src/nsComposeStrings.h
index 15d3420f7b3..a6fa784ab96 100644
--- a/mailnews/compose/src/nsComposeStrings.h
+++ b/mailnews/compose/src/nsComposeStrings.h
@@ -21,7 +21,6 @@
 #define NS_MSG_ERROR_WRITING_FILE                   NS_MSG_GENERATE_FAILURE(12512)
 #define NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER     NS_MSG_GENERATE_FAILURE(12513)
 #define NS_ERROR_SENDING_FROM_COMMAND               NS_MSG_GENERATE_FAILURE(12514)
-#define NS_ERROR_SENDING_RCPT_COMMAND               NS_MSG_GENERATE_FAILURE(12515)
 #define NS_ERROR_SENDING_DATA_COMMAND               NS_MSG_GENERATE_FAILURE(12516)
 #define NS_ERROR_SENDING_MESSAGE                    NS_MSG_GENERATE_FAILURE(12517)
 #define NS_ERROR_POST_FAILED                        NS_MSG_GENERATE_FAILURE(12518)
@@ -90,5 +89,6 @@
 
 #define NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER_WITH_STARTTLS1    NS_MSG_GENERATE_FAILURE(12573)
 #define NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER_WITH_STARTTLS2    NS_MSG_GENERATE_FAILURE(12574)
+#define NS_ERROR_SENDING_RCPT_COMMAND               NS_MSG_GENERATE_FAILURE(12575)
 
 #endif /* _nsComposeStringBundle_H__ */
\ No newline at end of file
diff --git a/mailnews/compose/src/nsSmtpProtocol.cpp b/mailnews/compose/src/nsSmtpProtocol.cpp
index cd96115ee25..b9edc147a69 100644
--- a/mailnews/compose/src/nsSmtpProtocol.cpp
+++ b/mailnews/compose/src/nsSmtpProtocol.cpp
@@ -1329,10 +1329,6 @@ PRInt32 nsSmtpProtocol::SendMailResponse()
       buffer += ">";
       buffer += CRLF;
     }
-    /* take the address we sent off the list (move the pointer to just
-	   past the terminating null.) */
-    m_addresses += PL_strlen (m_addresses) + 1;
-    m_addressesLeft--;
     nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
     status = SendData(url, buffer.get());
 
@@ -1355,7 +1351,8 @@ PRInt32 nsSmtpProtocol::SendRecipientResponse()
      (m_responseCode == 452) ? NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED :
     ((m_responseCode == 552) ? NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2 :
                                NS_ERROR_SENDING_RCPT_COMMAND),
-                               m_responseText.get());
+                               m_responseText.get(),
+                               m_addresses);
 
     NS_ASSERTION(NS_SUCCEEDED(rv), "failed to explain SMTP error");
 
@@ -1363,7 +1360,11 @@ PRInt32 nsSmtpProtocol::SendRecipientResponse()
     return(NS_ERROR_SENDING_RCPT_COMMAND);
   }
 
-  if(m_addressesLeft > 0)
+  /* take the address we sent off the list (move the pointer to just
+     past the terminating null.)
+   */
+  m_addresses += PL_strlen (m_addresses) + 1;
+  if(--m_addressesLeft > 0)
   {
     /* more senders to RCPT to
     */
diff --git a/suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties b/suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties
index 0900426e0d1..d3a48b54108 100644
--- a/suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties
@@ -82,9 +82,6 @@
 ## @name NS_ERROR_SENDING_FROM_COMMAND
 12514=An error occurred while sending mail. The mail server responded:  %s.  Please verify that your email address is correct in your Mail preferences and try again.
 
-## @name NS_ERROR_SENDING_RCPT_COMMAND
-12515=An error occurred while sending mail. The mail server responded:  %s. Please check the message recipients and try again.
-
 ## @name NS_ERROR_SENDING_DATA_COMMAND
 12516=An (SMTP) error occurred while sending mail. The server responded:  %s.
 
@@ -253,6 +250,9 @@ sendAnyway=Send anyway
 ## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER_WITH_STARTTLS2
 12574=An error occurred sending mail: Unable to connect to SMTP server %S via STARTTLS since it doesn't offer STARTTLS in its EHLO response. Please verify that your Mail/News account settings are correct and try again.
 
+## @name NS_ERROR_SENDING_RCPT_COMMAND
+12575=An error occurred while sending mail. The mail server responded:  %1$s. Please check the message recipient %2$s and try again.
+
 ## Strings use for the save message dialog shown when the user close a message compose window
 saveDlogTitle=Save Message
 saveDlogMessage=Message has not been sent. Do you want to save the message in the Drafts folder?