diff --git a/mailnews/compose/src/nsMsgComposeStringBundle.cpp b/mailnews/compose/src/nsMsgComposeStringBundle.cpp
index 387e0b8ddea7..b6da7546ff3b 100644
--- a/mailnews/compose/src/nsMsgComposeStringBundle.cpp
+++ b/mailnews/compose/src/nsMsgComposeStringBundle.cpp
@@ -44,10 +44,6 @@
 #include "nsIServiceManager.h"
 #include "nsIURI.h"
 
-static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
-
-#define COMPOSE_BE_URL       "chrome://messenger/locale/messengercompose/composeMsgs.properties"
-
 nsComposeStringService::nsComposeStringService()
 {
   NS_INIT_ISUPPORTS();
@@ -98,10 +94,10 @@ nsComposeStringService::GetBundle(nsIStringBundle **aResult)
 nsresult
 nsComposeStringService::InitializeStringBundle()
 {
-  nsCOMPtr<nsIStringBundleService> stringService = do_GetService(kStringBundleServiceCID);
+  nsCOMPtr<nsIStringBundleService> stringService = do_GetService(NS_STRINGBUNDLE_CONTRACTID);
   NS_ENSURE_TRUE(stringService, NS_ERROR_FAILURE);
 
-  NS_ENSURE_SUCCESS(stringService->CreateBundle(COMPOSE_BE_URL, getter_AddRefs(mComposeStringBundle)), 
+  NS_ENSURE_SUCCESS(stringService->CreateBundle("chrome://messenger/locale/messengercompose/composeMsgs.properties", getter_AddRefs(mComposeStringBundle)), 
                     NS_ERROR_FAILURE);
   return NS_OK;
 }
diff --git a/mailnews/compose/src/nsMsgEncoders.cpp b/mailnews/compose/src/nsMsgEncoders.cpp
index 86453f4afb1a..35dd4439a5af 100644
--- a/mailnews/compose/src/nsMsgEncoders.cpp
+++ b/mailnews/compose/src/nsMsgEncoders.cpp
@@ -44,8 +44,6 @@
 #include "nsMsgMimeCID.h"
 #include "nsIMimeConverter.h"
 
-/* This is the next generation string retrieval call */
-
 extern "C" MimeEncoderData *
 MIME_B64EncoderInit(nsresult (*output_fn) (const char *buf, PRInt32 size, void *closure), void *closure) 
 {