diff --git a/mozilla/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties b/mozilla/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties
index c68cd51b053..90085fd6a88 100644
--- a/mozilla/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mozilla/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties
@@ -184,7 +184,7 @@ noIdentities=You don't have any email identities yet.  Create one with the Accou
 12551=Posting message...
 
 ## @name NS_ERROR_MSG_MULTILINGUAL_SEND
-12553=The message you composed contains characters not found in the selected Character Encoding. While you can choose a different Character Encoding by returning to the composer window, it is usually safe to use Unicode (UTF-8) for mail. If you just send in the current Character Encoding, be aware that those not covered by the current Character Encoding will be turned to question marks and illegible by the recipient.
+12553=The message you composed contains characters not found in the selected Character Encoding. While you can choose a different Character Encoding, it is usually safe to use Unicode (UTF-8) for mail. If you just send in the current Character Encoding, be aware that those not covered by the current Character Encoding will be turned to question marks and illegible by the recipient.
 
 sendInUTF8=Send in UTF-8
 sendAnyway=Send anyway
diff --git a/mozilla/mailnews/compose/resources/locale/en-US/composeMsgs.properties b/mozilla/mailnews/compose/resources/locale/en-US/composeMsgs.properties
index 5f64f84aa65..642d402d8dd 100644
--- a/mozilla/mailnews/compose/resources/locale/en-US/composeMsgs.properties
+++ b/mozilla/mailnews/compose/resources/locale/en-US/composeMsgs.properties
@@ -184,7 +184,7 @@ noIdentities=You don't have any email identities yet.  Create one with the Accou
 12551=Posting message...
 
 ## @name NS_ERROR_MSG_MULTILINGUAL_SEND
-12553=The message you composed contains characters not found in the selected Character Encoding. While you can choose a different Character Encoding by returning to the composer window, it is usually safe to use Unicode (UTF-8) for mail. If you just send in the current Character Encoding, be aware that those not covered by the current Character Encoding will be turned to question marks and illegible by the recipient.
+12553=The message you composed contains characters not found in the selected Character Encoding. While you can choose a different Character Encoding, it is usually safe to use Unicode (UTF-8) for mail. If you just send in the current Character Encoding, be aware that those not covered by the current Character Encoding will be turned to question marks and illegible by the recipient.
 
 sendInUTF8=Send in UTF-8
 sendAnyway=Send anyway
diff --git a/mozilla/mailnews/compose/src/nsMsgSend.cpp b/mozilla/mailnews/compose/src/nsMsgSend.cpp
index f7a6d051a1c..589d0d6f8cd 100644
--- a/mozilla/mailnews/compose/src/nsMsgSend.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgSend.cpp
@@ -1768,7 +1768,6 @@ nsMsgComposeAndSend::GetBodyFromEditor()
       if (NS_ERROR_UENC_NOMAPPING == rv) {
         PRBool needToCheckCharset;
         mCompFields->GetNeedToCheckCharset(&needToCheckCharset);
-        printf("need to check charset=%d\n", needToCheckCharset);
         if (needToCheckCharset) {
           nsCOMPtr<nsIPrompt> prompt;
           GetDefaultPrompt(getter_AddRefs(prompt));