diff --git a/mailnews/base/resources/locale/en-US/messenger.properties b/mailnews/base/resources/locale/en-US/messenger.properties
index f4d4e4f2c4d..916acc674b3 100644
--- a/mailnews/base/resources/locale/en-US/messenger.properties
+++ b/mailnews/base/resources/locale/en-US/messenger.properties
@@ -50,4 +50,4 @@ MessageLoaded=Message loaded...
 PrintingMessage=Printing message...
 PrintingComplete=Printing complete.
 saveAttachmentFailed=Unable to save the attachment. Please check your file name and try again later.
-saveMessageFailed=Unable to save the message. Please check your file name and try again later.>>>>>>> 1.6
+saveMessageFailed=Unable to save the message. Please check your file name and try again later.
diff --git a/mailnews/base/src/nsMessenger.cpp b/mailnews/base/src/nsMessenger.cpp
index 00251b0847e..10b408d8a7a 100644
--- a/mailnews/base/src/nsMessenger.cpp
+++ b/mailnews/base/src/nsMessenger.cpp
@@ -789,12 +789,16 @@ done:
 nsresult
 nsMessenger::Alert(const char *stringName)
 {
-    nsresult rv;
+    nsresult rv = NS_OK;
     nsString errorMessage = GetString(nsString(stringName).GetUnicode());
+    nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(mWebShell));
+    if (docShell)
+    {
+        nsCOMPtr<nsIPrompt> dialog(do_GetInterface(docShell));
         
-    NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &rv);
-    if (NS_SUCCEEDED(rv))
-        rv = dialog->Alert(errorMessage.GetUnicode());
+        if (dialog)
+            rv = dialog->Alert(errorMessage.GetUnicode());
+    }
     return rv;
 }