diff --git a/mail/components/shell/nsMailGNOMEIntegration.cpp b/mail/components/shell/nsMailGNOMEIntegration.cpp
index 62f331e0d8..00f53d0cb4 100644
--- a/mail/components/shell/nsMailGNOMEIntegration.cpp
+++ b/mail/components/shell/nsMailGNOMEIntegration.cpp
@@ -309,7 +309,7 @@ nsMailGNOMEIntegration::MakeDefault(const char* const *aProtocols,
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsString brandShortName;
-    brandBundle->GetStringFromName(MOZ_UTF16("brandShortName"),
+    brandBundle->GetStringFromName(u"brandShortName",
                                    getter_Copies(brandShortName));
 
     // use brandShortName as the application id.
diff --git a/mailnews/addrbook/src/nsAbCardProperty.cpp b/mailnews/addrbook/src/nsAbCardProperty.cpp
index 1e11e043e4..110b07cc0d 100644
--- a/mailnews/addrbook/src/nsAbCardProperty.cpp
+++ b/mailnews/addrbook/src/nsAbCardProperty.cpp
@@ -681,10 +681,10 @@ nsresult nsAbCardProperty::ConvertToEscapedVCard(nsACString &aResult)
     uint32_t format;
     rv = GetPropertyAsUint32(kPreferMailFormatProperty, &format);
     if (NS_SUCCEEDED(rv) && format == nsIAbPreferMailFormat::html) {
-        myAddPropValue(vObj, VCUseHTML, MOZ_UTF16("TRUE"), &vCardHasData);
+        myAddPropValue(vObj, VCUseHTML, u"TRUE", &vCardHasData);
     }
     else if (NS_SUCCEEDED(rv) && format == nsIAbPreferMailFormat::plaintext) {
-        myAddPropValue(vObj, VCUseHTML, MOZ_UTF16("FALSE"), &vCardHasData);
+        myAddPropValue(vObj, VCUseHTML, u"FALSE", &vCardHasData);
     }
 
     rv = GetPropertyAsAString(kWorkWebPageProperty, str);
@@ -693,7 +693,7 @@ nsresult nsAbCardProperty::ConvertToEscapedVCard(nsACString &aResult)
         myAddPropValue(vObj, VCURLProp, str.get(), &vCardHasData);
     }
 
-    myAddPropValue(vObj, VCVersionProp, MOZ_UTF16("2.1"), nullptr);
+    myAddPropValue(vObj, VCVersionProp, u"2.1", nullptr);
 
     if (!vCardHasData) {
         aResult.Truncate();
@@ -729,7 +729,7 @@ nsresult nsAbCardProperty::ConvertToBase64EncodedXML(nsACString &result)
     rv = stringBundleService->CreateBundle(sAddrbookProperties, getter_AddRefs(bundle));
     if (NS_SUCCEEDED(rv)) {
       nsString addrBook;
-      rv = bundle->GetStringFromName(MOZ_UTF16("addressBook"), getter_Copies(addrBook));
+      rv = bundle->GetStringFromName(u"addressBook", getter_Copies(addrBook));
       if (NS_SUCCEEDED(rv)) {
         xmlStr.AppendLiteral("<title xmlns=\"http://www.w3.org/1999/xhtml\">");
         xmlStr.Append(addrBook);
@@ -821,7 +821,7 @@ nsresult nsAbCardProperty::ConvertToXMLPrintData(nsAString &aXMLSubstr)
     xmlStr.AppendLiteral("<section><sectiontitle>");
 
     nsString headingAddresses;
-    rv = bundle->GetStringFromName(MOZ_UTF16("headingAddresses"), getter_Copies(headingAddresses));
+    rv = bundle->GetStringFromName(u"headingAddresses", getter_Copies(headingAddresses));
     NS_ENSURE_SUCCESS(rv, rv);
 
     xmlStr.Append(headingAddresses);
@@ -1043,18 +1043,18 @@ nsresult nsAbCardProperty::AppendCityStateZip(const AppendItem &aItem,
 
   if (!cityResult.IsEmpty() && !stateResult.IsEmpty() && !zipResult.IsEmpty()) {
     const char16_t *formatStrings[] = { cityResult.get(), stateResult.get(), zipResult.get() };
-    rv = aBundle->FormatStringFromName(MOZ_UTF16("cityAndStateAndZip"), formatStrings, ArrayLength(formatStrings), getter_Copies(formattedString));
+    rv = aBundle->FormatStringFromName(u"cityAndStateAndZip", formatStrings, ArrayLength(formatStrings), getter_Copies(formattedString));
     NS_ENSURE_SUCCESS(rv,rv);
   }
   else if (!cityResult.IsEmpty() && !stateResult.IsEmpty() && zipResult.IsEmpty()) {
     const char16_t *formatStrings[] = { cityResult.get(), stateResult.get() };
-    rv = aBundle->FormatStringFromName(MOZ_UTF16("cityAndStateNoZip"), formatStrings, ArrayLength(formatStrings), getter_Copies(formattedString));
+    rv = aBundle->FormatStringFromName(u"cityAndStateNoZip", formatStrings, ArrayLength(formatStrings), getter_Copies(formattedString));
     NS_ENSURE_SUCCESS(rv,rv);
   }
   else if ((!cityResult.IsEmpty() && stateResult.IsEmpty() && !zipResult.IsEmpty()) ||
           (cityResult.IsEmpty() && !stateResult.IsEmpty() && !zipResult.IsEmpty())) {
     const char16_t *formatStrings[] = { cityResult.IsEmpty() ? stateResult.get() : cityResult.get(), zipResult.get() };
-    rv = aBundle->FormatStringFromName(MOZ_UTF16("cityOrStateAndZip"), formatStrings, ArrayLength(formatStrings), getter_Copies(formattedString));
+    rv = aBundle->FormatStringFromName(u"cityOrStateAndZip", formatStrings, ArrayLength(formatStrings), getter_Copies(formattedString));
     NS_ENSURE_SUCCESS(rv,rv);
   }
   else {
@@ -1108,13 +1108,13 @@ NS_IMETHODIMP nsAbCardProperty::GenerateName(int32_t aGenerateFormat,
     if (aGenerateFormat == GENERATE_LAST_FIRST_ORDER) {
       const char16_t *stringParams[2] = {lastName.get(), firstName.get()};
 
-      rv = bundle->FormatStringFromName(MOZ_UTF16("lastFirstFormat"),
+      rv = bundle->FormatStringFromName(u"lastFirstFormat",
                                         stringParams, 2, getter_Copies(result));
     }
     else {
       const char16_t *stringParams[2] = {firstName.get(), lastName.get()};
 
-      rv = bundle->FormatStringFromName(MOZ_UTF16("firstLastFormat"),
+      rv = bundle->FormatStringFromName(u"firstLastFormat",
                                         stringParams, 2, getter_Copies(result));
     }
     NS_ENSURE_SUCCESS(rv, rv); 
diff --git a/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp b/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp
index ff431a928f..cc4c042506 100644
--- a/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp
@@ -261,12 +261,12 @@ nsresult nsAbLDAPProcessChangeLogData::GetAuthData()
         return rv ;
 
     nsString title;
-    rv = bundle->GetStringFromName(MOZ_UTF16("AuthDlgTitle"), getter_Copies(title));
+    rv = bundle->GetStringFromName(u"AuthDlgTitle", getter_Copies(title));
     if (NS_FAILED (rv)) 
         return rv ;
 
     nsString desc;
-    rv = bundle->GetStringFromName(MOZ_UTF16("AuthDlgDesc"), getter_Copies(desc));
+    rv = bundle->GetStringFromName(u"AuthDlgDesc", getter_Copies(desc));
     if (NS_FAILED (rv)) 
         return rv ;
 
diff --git a/mailnews/addrbook/src/nsAbLDAPDirectory.cpp b/mailnews/addrbook/src/nsAbLDAPDirectory.cpp
index d38ee25a0f..d1bb484c08 100644
--- a/mailnews/addrbook/src/nsAbLDAPDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPDirectory.cpp
@@ -256,8 +256,8 @@ NS_IMETHODIMP nsAbLDAPDirectory::SetLDAPURL(nsILDAPURL *aUrl)
     // We inherit from nsIAbDirectory, so this static cast should be safe.
     abManager->NotifyItemPropertyChanged(static_cast<nsIAbDirectory*>(this),
       "IsSecure",
-      (newIsNotSecure ? MOZ_UTF16("true") : MOZ_UTF16("false")),
-      (newIsNotSecure ? MOZ_UTF16("false") : MOZ_UTF16("true")));
+      (newIsNotSecure ? u"true" : u"false"),
+      (newIsNotSecure ? u"false" : u"true"));
   }
 
   return NS_OK;
diff --git a/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp b/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
index 3bdd876e57..8f9cfe5675 100644
--- a/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
@@ -100,7 +100,7 @@ NS_IMETHODIMP nsAbLDAPListenerBase::OnLDAPInit(nsILDAPConnection *aConn, nsresul
     // get the title for the authentication prompt
     //
     nsString authPromptTitle;
-    rv = ldapBundle->GetStringFromName(MOZ_UTF16("authPromptTitle"),
+    rv = ldapBundle->GetStringFromName(u"authPromptTitle",
                                        getter_Copies(authPromptTitle));
     if (NS_FAILED(rv))
     {
@@ -133,7 +133,7 @@ NS_IMETHODIMP nsAbLDAPListenerBase::OnLDAPInit(nsILDAPConnection *aConn, nsresul
     // format the hostname into the authprompt text string
     //
     nsString authPromptText;
-    rv = ldapBundle->FormatStringFromName(MOZ_UTF16("authPromptText"),
+    rv = ldapBundle->FormatStringFromName(u"authPromptText",
                                           hostArray,
                                           sizeof(hostArray) / sizeof(const char16_t *),
                                           getter_Copies(authPromptText));
diff --git a/mailnews/addrbook/src/nsAbManager.cpp b/mailnews/addrbook/src/nsAbManager.cpp
index 0a36da9967..08a5d30bdb 100644
--- a/mailnews/addrbook/src/nsAbManager.cpp
+++ b/mailnews/addrbook/src/nsAbManager.cpp
@@ -550,7 +550,7 @@ NS_IMETHODIMP nsAbManager::ExportAddressBook(mozIDOMWindowProxy *aParentWin, nsI
   const char16_t *formatStrings[] = { dirName.get() };
 
   nsString title;
-  rv = bundle->FormatStringFromName(MOZ_UTF16("ExportAddressBookNameTitle"), formatStrings,
+  rv = bundle->FormatStringFromName(u"ExportAddressBookNameTitle", formatStrings,
                                     ArrayLength(formatStrings), getter_Copies(title));
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -560,31 +560,31 @@ NS_IMETHODIMP nsAbManager::ExportAddressBook(mozIDOMWindowProxy *aParentWin, nsI
   nsString filterString;
 
   // CSV: System charset and UTF-8.
-  rv = bundle->GetStringFromName(MOZ_UTF16("CSVFilesSysCharset"), getter_Copies(filterString));
+  rv = bundle->GetStringFromName(u"CSVFilesSysCharset", getter_Copies(filterString));
   NS_ENSURE_SUCCESS(rv, rv);
   rv = filePicker->AppendFilter(filterString, NS_LITERAL_STRING("*.csv"));
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = bundle->GetStringFromName(MOZ_UTF16("CSVFilesUTF8"), getter_Copies(filterString));
+  rv = bundle->GetStringFromName(u"CSVFilesUTF8", getter_Copies(filterString));
   NS_ENSURE_SUCCESS(rv, rv);
   rv = filePicker->AppendFilter(filterString, NS_LITERAL_STRING("*.csv"));
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Tab separated: System charset and UTF-8.
-  rv = bundle->GetStringFromName(MOZ_UTF16("TABFilesSysCharset"), getter_Copies(filterString));
+  rv = bundle->GetStringFromName(u"TABFilesSysCharset", getter_Copies(filterString));
   NS_ENSURE_SUCCESS(rv, rv);
   rv = filePicker->AppendFilter(filterString, NS_LITERAL_STRING("*.tab; *.txt"));
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = bundle->GetStringFromName(MOZ_UTF16("TABFilesUTF8"), getter_Copies(filterString));
+  rv = bundle->GetStringFromName(u"TABFilesUTF8", getter_Copies(filterString));
   NS_ENSURE_SUCCESS(rv, rv);
   rv = filePicker->AppendFilter(filterString, NS_LITERAL_STRING("*.tab; *.txt"));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = bundle->GetStringFromName(MOZ_UTF16("VCFFiles"), getter_Copies(filterString));
+  rv = bundle->GetStringFromName(u"VCFFiles", getter_Copies(filterString));
   NS_ENSURE_SUCCESS(rv, rv);
   rv = filePicker->AppendFilter(filterString, NS_LITERAL_STRING("*.vcf"));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = bundle->GetStringFromName(MOZ_UTF16("LDIFFiles"), getter_Copies(filterString));
+  rv = bundle->GetStringFromName(u"LDIFFiles", getter_Copies(filterString));
   NS_ENSURE_SUCCESS(rv, rv);
   rv = filePicker->AppendFilter(filterString, NS_LITERAL_STRING("*.ldi; *.ldif"));
   NS_ENSURE_SUCCESS(rv, rv);
diff --git a/mailnews/addrbook/src/nsAbView.cpp b/mailnews/addrbook/src/nsAbView.cpp
index 13ee79d6d3..77f3122dfe 100644
--- a/mailnews/addrbook/src/nsAbView.cpp
+++ b/mailnews/addrbook/src/nsAbView.cpp
@@ -475,7 +475,7 @@ nsresult nsAbView::GetCardValue(nsIAbCard *card, const char16_t *colID,
     // Use LN/FN order for the phonetic name
     return card->GeneratePhoneticName(true, _retval);
 
-  if (!NS_strcmp(colID, MOZ_UTF16("ChatName")))
+  if (!NS_strcmp(colID, u"ChatName"))
     return card->GenerateChatName(_retval);
 
   nsresult rv = card->GetPropertyAsAString(NS_ConvertUTF16toUTF8(colID).get(), _retval);
@@ -664,7 +664,7 @@ static void SetSortClosure(const char16_t *sortColumn, const char16_t *sortDirec
 {
   closure->colID = sortColumn;
   
-  if (sortDirection && !NS_strcmp(sortDirection, MOZ_UTF16("descending")))
+  if (sortDirection && !NS_strcmp(sortDirection, u"descending"))
     closure->factor = DESCENDING_SORT_FACTOR;
   else 
     closure->factor = ASCENDING_SORT_FACTOR;
@@ -1319,8 +1319,8 @@ NS_IMETHODIMP nsAbView::SwapFirstNameLastName()
 
             // The format should stays the same before/after we swap the names
             formatString = displayNameLastnamefirst ?
-                              MOZ_UTF16("lastFirstFormat") :
-                              MOZ_UTF16("firstLastFormat");
+                              u"lastFirstFormat" :
+                              u"firstLastFormat";
 
             // Generate both ln/fn and fn/ln combination since we need both later
             // to check to see if the current display name was edited
diff --git a/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp b/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
index 6e71906732..f599148d62 100644
--- a/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
+++ b/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
@@ -279,7 +279,7 @@ nsAddbookProtocolHandler::BuildDirectoryXML(nsIAbDirectory *aDirectory,
     rv = stringBundleService->CreateBundle("chrome://messenger/locale/addressbook/addressBook.properties", getter_AddRefs(bundle));
     if (NS_SUCCEEDED(rv)) {
       nsString addrBook;
-      rv = bundle->GetStringFromName(MOZ_UTF16("addressBook"), getter_Copies(addrBook));
+      rv = bundle->GetStringFromName(u"addressBook", getter_Copies(addrBook));
       if (NS_SUCCEEDED(rv)) {
         aOutput.AppendLiteral("<title xmlns=\"http://www.w3.org/1999/xhtml\">");
         aOutput.Append(addrBook);
diff --git a/mailnews/addrbook/src/nsAddrDatabase.cpp b/mailnews/addrbook/src/nsAddrDatabase.cpp
index 0653d05e05..ea29ba8af0 100644
--- a/mailnews/addrbook/src/nsAddrDatabase.cpp
+++ b/mailnews/addrbook/src/nsAddrDatabase.cpp
@@ -429,15 +429,15 @@ nsresult nsAddrDatabase::DisplayAlert(const char16_t *titleName, const char16_t
 nsresult nsAddrDatabase::AlertAboutCorruptMabFile(const char16_t *aOldFileName, const char16_t *aNewFileName)
 {
   const char16_t *formatStrings[] = { aOldFileName, aOldFileName, aNewFileName };
-  return DisplayAlert(MOZ_UTF16("corruptMabFileTitle"),
-    MOZ_UTF16("corruptMabFileAlert"), formatStrings, 3);
+  return DisplayAlert(u"corruptMabFileTitle",
+    u"corruptMabFileAlert", formatStrings, 3);
 }
 
 nsresult nsAddrDatabase::AlertAboutLockedMabFile(const char16_t *aFileName)
 {
   const char16_t *formatStrings[] = { aFileName };
-  return DisplayAlert(MOZ_UTF16("lockedMabFileTitle"),
-    MOZ_UTF16("lockedMabFileAlert"), formatStrings, 1);
+  return DisplayAlert(u"lockedMabFileTitle",
+    u"lockedMabFileAlert", formatStrings, 1);
 }
 
 nsresult
diff --git a/mailnews/base/search/src/nsMsgFilter.cpp b/mailnews/base/search/src/nsMsgFilter.cpp
index bdd24661f6..c9bd6c9553 100644
--- a/mailnews/base/search/src/nsMsgFilter.cpp
+++ b/mailnews/base/search/src/nsMsgFilter.cpp
@@ -586,7 +586,7 @@ nsMsgFilter::LogRuleHitGeneric(nsIMsgRuleAction *aFilterAction,
       const char16_t *logErrorFormatStrings[2] = { tErrmsg16.get(),  tcode16.get()};
       nsString filterFailureWarningPrefix;
       rv = bundle->FormatStringFromName(
-                      MOZ_UTF16("filterFailureWarningPrefix"),
+                      u"filterFailureWarningPrefix",
                       logErrorFormatStrings, 2,
                       getter_Copies(filterFailureWarningPrefix));
       NS_ENSURE_SUCCESS(rv, rv);
@@ -597,7 +597,7 @@ nsMsgFilter::LogRuleHitGeneric(nsIMsgRuleAction *aFilterAction,
     const char16_t *filterLogDetectFormatStrings[4] = { filterName.get(), authorValue.get(), subjectValue.get(), dateValue.get() };
     nsString filterLogDetectStr;
     rv = bundle->FormatStringFromName(
-      MOZ_UTF16("filterLogDetectStr"),
+      u"filterLogDetectStr",
       filterLogDetectFormatStrings, 4,
       getter_Copies(filterLogDetectStr));
     NS_ENSURE_SUCCESS(rv, rv);
@@ -620,7 +620,7 @@ nsMsgFilter::LogRuleHitGeneric(nsIMsgRuleAction *aFilterAction,
       nsString logMoveStr;
       rv = bundle->FormatStringFromName(
         (actionType == nsMsgFilterAction::MoveToFolder) ?
-          MOZ_UTF16("logMoveStr") : MOZ_UTF16("logCopyStr"),
+          u"logMoveStr" : u"logCopyStr",
         logMoveFormatStrings, 2,
         getter_Copies(logMoveStr));
       NS_ENSURE_SUCCESS(rv, rv);
@@ -636,7 +636,7 @@ nsMsgFilter::LogRuleHitGeneric(nsIMsgRuleAction *aFilterAction,
         customAction->GetName(filterActionName);
       if (filterActionName.IsEmpty())
         bundle->GetStringFromName(
-                  MOZ_UTF16("filterMissingCustomAction"),
+                  u"filterMissingCustomAction",
                   getter_Copies(filterActionName));
       buffer += NS_ConvertUTF16toUTF8(filterActionName);
     }
diff --git a/mailnews/base/search/src/nsMsgFilterService.cpp b/mailnews/base/search/src/nsMsgFilterService.cpp
index e82ee0103b..3c501de996 100644
--- a/mailnews/base/search/src/nsMsgFilterService.cpp
+++ b/mailnews/base/search/src/nsMsgFilterService.cpp
@@ -1180,7 +1180,7 @@ bool nsMsgFilterAfterTheFact::ContinueExecutionPrompt()
   {
     filterName.get()
   };
-  nsresult rv = bundle->FormatStringFromName(MOZ_UTF16("continueFilterExecution"),
+  nsresult rv = bundle->FormatStringFromName(u"continueFilterExecution",
                                              formatStrings, 1, getter_Copies(confirmText));
   if (NS_FAILED(rv))
     return false;
diff --git a/mailnews/base/search/src/nsMsgSearchAdapter.cpp b/mailnews/base/search/src/nsMsgSearchAdapter.cpp
index 5719df374c..c719cdc6c2 100644
--- a/mailnews/base/search/src/nsMsgSearchAdapter.cpp
+++ b/mailnews/base/search/src/nsMsgSearchAdapter.cpp
@@ -154,7 +154,7 @@ nsMsgSearchAdapter::GetImapCharsetParam(const char16_t *destCharset)
   char *result = nullptr;
 
   // Specify a character set unless we happen to be US-ASCII.
-  if (NS_strcmp(destCharset, MOZ_UTF16("us-ascii")))
+  if (NS_strcmp(destCharset, u"us-ascii"))
       result = PR_smprintf("%s%s", nsMsgSearchAdapter::m_kImapCharset, NS_ConvertUTF16toUTF8(destCharset).get());
 
   return result;
diff --git a/mailnews/base/src/nsMessenger.cpp b/mailnews/base/src/nsMessenger.cpp
index e4473ff812..c9a3ab8210 100644
--- a/mailnews/base/src/nsMessenger.cpp
+++ b/mailnews/base/src/nsMessenger.cpp
@@ -253,7 +253,7 @@ NS_IMETHODIMP nsMessenger::SetWindow(mozIDOMWindowProxy *aWin, nsIMsgWindow *aMs
     docShellAsItem->GetSameTypeRootTreeItem(getter_AddRefs(rootDocShellAsItem));
 
     nsCOMPtr<nsIDocShellTreeItem> childAsItem;
-    rv = rootDocShellAsItem->FindChildWithName(MOZ_UTF16("messagepane"), true, false,
+    rv = rootDocShellAsItem->FindChildWithName(u"messagepane", true, false,
                                                nullptr, nullptr, getter_AddRefs(childAsItem));
 
     mDocShell = do_QueryInterface(childAsItem);
@@ -326,7 +326,7 @@ nsMessenger::PromptIfFileExists(nsIFile *file)
       rv = InitStringBundle();
       NS_ENSURE_SUCCESS(rv, rv);
     }
-    rv = mStringBundle->FormatStringFromName(MOZ_UTF16("fileExists"),
+    rv = mStringBundle->FormatStringFromName(u"fileExists",
                                              pathFormatStrings, 1,
                                              getter_Copies(errorMessage));
     NS_ENSURE_SUCCESS(rv, rv);
@@ -837,7 +837,7 @@ nsMessenger::SaveOneAttachment(const char * aContentType, const char * aURL,
     nsString filterName;
     const char16_t *extensionParam[] = { extension.get() };
     rv = mStringBundle->FormatStringFromName(
-      MOZ_UTF16("saveAsType"), extensionParam, 1, getter_Copies(filterName));
+      u"saveAsType", extensionParam, 1, getter_Copies(filterName));
     NS_ENSURE_SUCCESS(rv, rv);
 
     extension.Insert(NS_LITERAL_STRING("*."), 0);
@@ -3053,7 +3053,7 @@ nsMessenger::PromptIfDeleteAttachments(bool aSaveFirst,
   // format the message and display
   nsString promptMessage;
   const char16_t * propertyName = aSaveFirst ?
-    MOZ_UTF16("detachAttachments") : MOZ_UTF16("deleteAttachments");
+    u"detachAttachments" : u"deleteAttachments";
   rv = mStringBundle->FormatStringFromName(propertyName, formatStrings, 1,getter_Copies(promptMessage));
   NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/mailnews/base/src/nsMessengerUnixIntegration.cpp b/mailnews/base/src/nsMessengerUnixIntegration.cpp
index 923d711680..e266244faa 100644
--- a/mailnews/base/src/nsMessengerUnixIntegration.cpp
+++ b/mailnews/base/src/nsMessengerUnixIntegration.cpp
@@ -176,8 +176,8 @@ nsMessengerUnixIntegration::BuildNotificationTitle(nsIMsgFolder *aFolder, nsIStr
   };
 
   aBundle->FormatStringFromName(numNewMessages == 1 ?
-                                  MOZ_UTF16("newMailNotification_message") :
-                                  MOZ_UTF16("newMailNotification_messages"),
+                                  u"newMailNotification_message" :
+                                  u"newMailNotification_messages",
                                 formatStrings, 2, getter_Copies(aTitle));
   return true;
 }
@@ -295,7 +295,7 @@ nsMessengerUnixIntegration::BuildNotificationBody(nsIMsgDBHdr *aHdr,
     {
       subject.get(), author.get()
     };
-    aBundle->FormatStringFromName(MOZ_UTF16("newMailNotification_messagetitle"),
+    aBundle->FormatStringFromName(u"newMailNotification_messagetitle",
         formatStrings, 2, getter_Copies(msgTitle));
     alertBody.Append(msgTitle);
   }
diff --git a/mailnews/base/src/nsMessengerWinIntegration.cpp b/mailnews/base/src/nsMessengerWinIntegration.cpp
index 142b7a114d..f431036a7b 100644
--- a/mailnews/base/src/nsMessengerWinIntegration.cpp
+++ b/mailnews/base/src/nsMessengerWinIntegration.cpp
@@ -735,9 +735,9 @@ void nsMessengerWinIntegration::FillToolTipInfo()
 
         nsString finalText;
         if (numNewMessages == 1)
-          bundle->FormatStringFromName(MOZ_UTF16("biffNotification_message"), formatStrings, 1, getter_Copies(finalText));
+          bundle->FormatStringFromName(u"biffNotification_message", formatStrings, 1, getter_Copies(finalText));
         else
-          bundle->FormatStringFromName(MOZ_UTF16("biffNotification_messages"), formatStrings, 1, getter_Copies(finalText));
+          bundle->FormatStringFromName(u"biffNotification_messages", formatStrings, 1, getter_Copies(finalText));
 
         // the alert message is special...we actually only want to show the first account with
         // new mail in the alert.
diff --git a/mailnews/base/src/nsMsgAccountManager.cpp b/mailnews/base/src/nsMsgAccountManager.cpp
index cb3459c935..11232e923e 100644
--- a/mailnews/base/src/nsMsgAccountManager.cpp
+++ b/mailnews/base/src/nsMsgAccountManager.cpp
@@ -2299,7 +2299,7 @@ nsresult nsMsgAccountManager::GetLocalFoldersPrettyName(nsString &localFoldersNa
                                     getter_AddRefs(bundle));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  return bundle->GetStringFromName(MOZ_UTF16("localFolders"), getter_Copies(localFoldersName));
+  return bundle->GetStringFromName(u"localFolders", getter_Copies(localFoldersName));
 }
 
 NS_IMETHODIMP
diff --git a/mailnews/base/src/nsMsgAccountManagerDS.cpp b/mailnews/base/src/nsMsgAccountManagerDS.cpp
index 6548c49fa7..728aaabce1 100644
--- a/mailnews/base/src/nsMsgAccountManagerDS.cpp
+++ b/mailnews/base/src/nsMsgAccountManagerDS.cpp
@@ -154,7 +154,7 @@ nsMsgAccountManagerDataSource::nsMsgAccountManagerDataSource()
     getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_ACCOUNTROOT),
                                  &kNC_AccountRoot);
 
-    getRDFService()->GetLiteral(MOZ_UTF16("true"),
+    getRDFService()->GetLiteral(u"true",
                                 &kTrueLiteral);
 
     // eventually these need to exist in some kind of array
@@ -281,26 +281,26 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
 
     nsString pageTitle;
     if (source == kNC_PageTitleServer)
-      mStringBundle->GetStringFromName(MOZ_UTF16("prefPanel-server"),
+      mStringBundle->GetStringFromName(u"prefPanel-server",
                                        getter_Copies(pageTitle));
 
     else if (source == kNC_PageTitleCopies)
-      mStringBundle->GetStringFromName(MOZ_UTF16("prefPanel-copies"),
+      mStringBundle->GetStringFromName(u"prefPanel-copies",
                                        getter_Copies(pageTitle));
     else if (source == kNC_PageTitleSynchronization)
-      mStringBundle->GetStringFromName(MOZ_UTF16("prefPanel-synchronization"),
+      mStringBundle->GetStringFromName(u"prefPanel-synchronization",
                                        getter_Copies(pageTitle));
     else if (source == kNC_PageTitleDiskSpace)
-      mStringBundle->GetStringFromName(MOZ_UTF16("prefPanel-diskspace"),
+      mStringBundle->GetStringFromName(u"prefPanel-diskspace",
                                        getter_Copies(pageTitle));
     else if (source == kNC_PageTitleAddressing)
-      mStringBundle->GetStringFromName(MOZ_UTF16("prefPanel-addressing"),
+      mStringBundle->GetStringFromName(u"prefPanel-addressing",
                                        getter_Copies(pageTitle));
     else if (source == kNC_PageTitleSMTP)
-      mStringBundle->GetStringFromName(MOZ_UTF16("prefPanel-smtp"),
+      mStringBundle->GetStringFromName(u"prefPanel-smtp",
                                        getter_Copies(pageTitle));
     else if (source == kNC_PageTitleJunk)
-      mStringBundle->GetStringFromName(MOZ_UTF16("prefPanel-junk"),
+      mStringBundle->GetStringFromName(u"prefPanel-junk",
                                        getter_Copies(pageTitle));
 
     else {
diff --git a/mailnews/base/src/nsMsgDBView.cpp b/mailnews/base/src/nsMsgDBView.cpp
index 15d0900760..b6a94b9cbc 100644
--- a/mailnews/base/src/nsMsgDBView.cpp
+++ b/mailnews/base/src/nsMsgDBView.cpp
@@ -157,16 +157,16 @@ void nsMsgDBView::InitializeAtomsAndLiterals()
   kNotJunkMsgAtom = MsgNewAtom("notjunk").take();
 
   // priority strings
-  kHighestPriorityString = GetString(MOZ_UTF16("priorityHighest"));
-  kHighPriorityString = GetString(MOZ_UTF16("priorityHigh"));
-  kLowestPriorityString = GetString(MOZ_UTF16("priorityLowest"));
-  kLowPriorityString = GetString(MOZ_UTF16("priorityLow"));
-  kNormalPriorityString = GetString(MOZ_UTF16("priorityNormal"));
+  kHighestPriorityString = GetString(u"priorityHighest");
+  kHighPriorityString = GetString(u"priorityHigh");
+  kLowestPriorityString = GetString(u"priorityLowest");
+  kLowPriorityString = GetString(u"priorityLow");
+  kNormalPriorityString = GetString(u"priorityNormal");
 
-  kReadString = GetString(MOZ_UTF16("read"));
-  kRepliedString = GetString(MOZ_UTF16("replied"));
-  kForwardedString = GetString(MOZ_UTF16("forwarded"));
-  kNewString = GetString(MOZ_UTF16("new"));
+  kReadString = GetString(u"read");
+  kRepliedString = GetString(u"replied");
+  kForwardedString = GetString(u"forwarded");
+  kNewString = GetString(u"new");
 }
 
 nsMsgDBView::~nsMsgDBView()
@@ -1730,14 +1730,14 @@ NS_IMETHODIMP nsMsgDBView::GetCellValue(int32_t aRow, nsITreeColumn* aCol, nsASt
     case 'a': // attachment column
       if (flags & nsMsgMessageFlags::Attachment) {
         nsString tmp_str;
-        tmp_str.Adopt(GetString(MOZ_UTF16("messageHasAttachment")));
+        tmp_str.Adopt(GetString(u"messageHasAttachment"));
         aValue.Assign(tmp_str);
       }
       break;
     case 'f': // flagged (starred) column
       if (flags & nsMsgMessageFlags::Marked) {
         nsString tmp_str;
-        tmp_str.Adopt(GetString(MOZ_UTF16("messageHasFlag")));
+        tmp_str.Adopt(GetString(u"messageHasFlag"));
         aValue.Assign(tmp_str);
       }
       break;
@@ -1769,8 +1769,8 @@ NS_IMETHODIMP nsMsgDBView::GetCellValue(int32_t aRow, nsITreeColumn* aCol, nsASt
 
             IsContainerOpen(aRow, &isContainerOpen);
             tmp_str.Adopt(GetString(isContainerOpen ?
-                            MOZ_UTF16("messageExpanded") :
-                            MOZ_UTF16("messageCollapsed")));
+                            u"messageExpanded" :
+                            u"messageCollapsed"));
             aValue.Assign(tmp_str);
           }
         }
@@ -1779,7 +1779,7 @@ NS_IMETHODIMP nsMsgDBView::GetCellValue(int32_t aRow, nsITreeColumn* aCol, nsASt
     case 'u': // read/unread column
       if (!(flags & nsMsgMessageFlags::Read)) {
         nsString tmp_str;
-        tmp_str.Adopt(GetString(MOZ_UTF16("messageUnread")));
+        tmp_str.Adopt(GetString(u"messageUnread"));
         aValue.Assign(tmp_str);
       }
       break;
@@ -3230,9 +3230,9 @@ nsresult nsMsgDBView::DeleteMessages(nsIMsgWindow *window, nsMsgViewIndex *indic
     nsString confirmString;
     nsString checkboxText;
     nsString buttonApplyNowText;
-    dialogTitle.Adopt(GetString(MOZ_UTF16("confirmMsgDelete.title")));
-    checkboxText.Adopt(GetString(MOZ_UTF16("confirmMsgDelete.dontAsk.label")));
-    buttonApplyNowText.Adopt(GetString(MOZ_UTF16("confirmMsgDelete.delete.label")));
+    dialogTitle.Adopt(GetString(u"confirmMsgDelete.title"));
+    checkboxText.Adopt(GetString(u"confirmMsgDelete.dontAsk.label"));
+    buttonApplyNowText.Adopt(GetString(u"confirmMsgDelete.delete.label"));
 
     confirmString.Adopt(GetString(warningName.get()));
 
diff --git a/mailnews/base/src/nsMsgFolderCompactor.cpp b/mailnews/base/src/nsMsgFolderCompactor.cpp
index 6b399b7954..71767fe1fb 100644
--- a/mailnews/base/src/nsMsgFolderCompactor.cpp
+++ b/mailnews/base/src/nsMsgFolderCompactor.cpp
@@ -661,7 +661,7 @@ void nsFolderCompactState::ShowDoneStatus()
     nsAutoString expungedAmount;
     FormatFileSize(m_totalExpungedBytes, true, expungedAmount);
     const char16_t* params[] = { expungedAmount.get() };
-    rv = bundle->FormatStringFromName(MOZ_UTF16("compactingDone"),
+    rv = bundle->FormatStringFromName(u"compactingDone",
                                       params, 1, getter_Copies(statusString));
 
     if (!statusString.IsEmpty() && NS_SUCCEEDED(rv))
diff --git a/mailnews/base/src/nsMsgFolderDataSource.cpp b/mailnews/base/src/nsMsgFolderDataSource.cpp
index 385e915bce..c4d2cf425e 100644
--- a/mailnews/base/src/nsMsgFolderDataSource.cpp
+++ b/mailnews/base/src/nsMsgFolderDataSource.cpp
@@ -281,9 +281,9 @@ nsMsgFolderDataSource::~nsMsgFolderDataSource (void)
 
 nsresult nsMsgFolderDataSource::CreateLiterals(nsIRDFService *rdf)
 {
-  createNode(MOZ_UTF16("true"),
+  createNode(u"true",
     getter_AddRefs(kTrueLiteral), rdf);
-  createNode(MOZ_UTF16("false"),
+  createNode(u"false",
     getter_AddRefs(kFalseLiteral), rdf);
 
   return NS_OK;
@@ -1041,7 +1041,7 @@ nsresult nsMsgFolderDataSource::CreateUnreadMessagesNameString(int32_t unreadMes
   {
     nameString.Append(NS_LITERAL_STRING(" ("));
     nameString.AppendInt(unreadMessages);
-    nameString.Append(MOZ_UTF16(')'));
+    nameString.Append(u')');
   }
   return NS_OK;
 }
@@ -1503,13 +1503,13 @@ nsMsgFolderDataSource::createBiffStateNodeFromFlag(uint32_t flag, nsIRDFNode **t
 
   switch (flag) {
     case nsIMsgFolder::nsMsgBiffState_NewMail:
-      biffStateStr = MOZ_UTF16("NewMail");
+      biffStateStr = u"NewMail";
       break;
     case nsIMsgFolder::nsMsgBiffState_NoMail:
-      biffStateStr = MOZ_UTF16("NoMail");
+      biffStateStr = u"NoMail";
       break;
     default:
-      biffStateStr = MOZ_UTF16("UnknownMail");
+      biffStateStr = u"UnknownMail";
       break;
   }
 
@@ -1782,7 +1782,7 @@ nsMsgFolderDataSource::GetNumMessagesNode(int32_t aNumMessages, nsIRDFNode **nod
 {
   uint32_t numMessages = aNumMessages;
   if(numMessages == kDisplayQuestionCount)
-    createNode(MOZ_UTF16("???"), node, getRDFService());
+    createNode(u"???", node, getRDFService());
   else if (numMessages == kDisplayBlankCount || numMessages == 0)
     createNode(EmptyString().get(), node, getRDFService());
   else
@@ -1797,7 +1797,7 @@ nsMsgFolderDataSource::GetFolderSizeNode(int64_t aFolderSize, nsIRDFNode **aNode
   if (aFolderSize == kDisplayBlankCount64 || aFolderSize == 0)
     createNode(EmptyString().get(), aNode, getRDFService());
   else if (aFolderSize == kDisplayQuestionCount64)
-    createNode(MOZ_UTF16("???"), aNode, getRDFService());
+    createNode(u"???", aNode, getRDFService());
   else
   {
     nsAutoString sizeString;
@@ -1972,7 +1972,7 @@ nsresult nsMsgFolderDataSource::DoDeleteFromFolder(nsIMsgFolder *folder, nsISupp
         nsString confirmMsg;
         rv = sBundleService->CreateBundle(MESSENGER_STRING_URL, getter_AddRefs(sMessengerStringBundle));
         NS_ENSURE_SUCCESS(rv, rv);
-        sMessengerStringBundle->GetStringFromName(MOZ_UTF16("confirmSavedSearchDeleteMessage"), getter_Copies(confirmMsg));
+        sMessengerStringBundle->GetStringFromName(u"confirmSavedSearchDeleteMessage", getter_Copies(confirmMsg));
 
         nsCOMPtr<nsIPrompt> dialog;
         rv = msgWindow->GetPromptDialog(getter_AddRefs(dialog));
diff --git a/mailnews/base/src/nsMsgGroupView.cpp b/mailnews/base/src/nsMsgGroupView.cpp
index 136c946bd3..096cfde96e 100755
--- a/mailnews/base/src/nsMsgGroupView.cpp
+++ b/mailnews/base/src/nsMsgGroupView.cpp
@@ -805,33 +805,33 @@ NS_IMETHODIMP nsMsgGroupView::CellTextForColumn(int32_t aRow,
           {
           case 1:
             if (m_kTodayString.IsEmpty())
-              m_kTodayString.Adopt(GetString(MOZ_UTF16("today")));
+              m_kTodayString.Adopt(GetString(u"today"));
             aValue.Assign(m_kTodayString);
             break;
           case 2:
             if (m_kYesterdayString.IsEmpty())
-              m_kYesterdayString.Adopt(GetString(MOZ_UTF16("yesterday")));
+              m_kYesterdayString.Adopt(GetString(u"yesterday"));
             aValue.Assign(m_kYesterdayString);
             break;
           case 3:
             if (m_kLastWeekString.IsEmpty())
-              m_kLastWeekString.Adopt(GetString(MOZ_UTF16("lastWeek")));
+              m_kLastWeekString.Adopt(GetString(u"lastWeek"));
             aValue.Assign(m_kLastWeekString);
             break;
           case 4:
             if (m_kTwoWeeksAgoString.IsEmpty())
-              m_kTwoWeeksAgoString.Adopt(GetString(MOZ_UTF16("twoWeeksAgo")));
+              m_kTwoWeeksAgoString.Adopt(GetString(u"twoWeeksAgo"));
             aValue.Assign(m_kTwoWeeksAgoString);
             break;
           case 5:
             if (m_kOldMailString.IsEmpty())
-              m_kOldMailString.Adopt(GetString(MOZ_UTF16("older")));
+              m_kOldMailString.Adopt(GetString(u"older"));
             aValue.Assign(m_kOldMailString);
             break;
           default:
             // Future date, error/spoofed.
             if (m_kFutureDateString.IsEmpty())
-              m_kFutureDateString.Adopt(GetString(MOZ_UTF16("futureDate")));
+              m_kFutureDateString.Adopt(GetString(u"futureDate"));
             aValue.Assign(m_kFutureDateString);
             break;
           }
@@ -846,21 +846,21 @@ NS_IMETHODIMP nsMsgGroupView::CellTextForColumn(int32_t aRow,
         case nsMsgViewSortType::byStatus:
           rv = FetchStatus(m_flags[aRow], aValue);
           if (aValue.IsEmpty()) {
-            tmp_str.Adopt(GetString(MOZ_UTF16("messagesWithNoStatus")));
+            tmp_str.Adopt(GetString(u"messagesWithNoStatus"));
             aValue.Assign(tmp_str);
           }
           break;
         case nsMsgViewSortType::byTags:
           rv = FetchTags(msgHdr, aValue);
           if (aValue.IsEmpty()) {
-            tmp_str.Adopt(GetString(MOZ_UTF16("untaggedMessages")));
+            tmp_str.Adopt(GetString(u"untaggedMessages"));
             aValue.Assign(tmp_str);
           }
           break;
         case nsMsgViewSortType::byPriority:
           FetchPriority(msgHdr, aValue);
           if (aValue.IsEmpty()) {
-            tmp_str.Adopt(GetString(MOZ_UTF16("noPriority")));
+            tmp_str.Adopt(GetString(u"noPriority"));
             aValue.Assign(tmp_str);
           }
           break;
@@ -872,12 +872,12 @@ NS_IMETHODIMP nsMsgGroupView::CellTextForColumn(int32_t aRow,
           break;
         case nsMsgViewSortType::byAttachments:
           tmp_str.Adopt(GetString(flags & nsMsgMessageFlags::Attachment ?
-            MOZ_UTF16("attachments") : MOZ_UTF16("noAttachments")));
+            u"attachments" : u"noAttachments"));
           aValue.Assign(tmp_str);
           break;
         case nsMsgViewSortType::byFlagged:
           tmp_str.Adopt(GetString(flags & nsMsgMessageFlags::Marked ?
-            MOZ_UTF16("groupFlagged") : MOZ_UTF16("notFlagged")));
+            u"groupFlagged" : u"notFlagged"));
           aValue.Assign(tmp_str);
           break;
         // byLocation is a special case; we don't want to have duplicate
diff --git a/mailnews/base/src/nsMsgPrintEngine.cpp b/mailnews/base/src/nsMsgPrintEngine.cpp
index 769181de78..d9e0bdb208 100644
--- a/mailnews/base/src/nsMsgPrintEngine.cpp
+++ b/mailnews/base/src/nsMsgPrintEngine.cpp
@@ -78,7 +78,7 @@ nsMsgPrintEngine::OnStateChange(nsIWebProgress* aWebProgress,
     if (progressStateFlags & nsIWebProgressListener::STATE_START) {
       // Tell the user we are loading...
       nsString msg;
-      GetString(MOZ_UTF16("LoadingMessageToPrint"), msg);
+      GetString(u"LoadingMessageToPrint", msg);
       SetStatusMessage(msg);
     }
 
@@ -121,7 +121,7 @@ nsMsgPrintEngine::OnStateChange(nsIWebProgress* aWebProgress,
 
           // Tell the user the message is loaded...
           nsString msg;
-          GetString(MOZ_UTF16("MessageLoaded"), msg);
+          GetString(u"MessageLoaded", msg);
           SetStatusMessage(msg);
 
           NS_ASSERTION(mDocShell,"can't print, there is no docshell");
@@ -237,7 +237,7 @@ nsMsgPrintEngine::SetWindow(mozIDOMWindowProxy *aWin)
   docShellAsItem->GetSameTypeRootTreeItem(getter_AddRefs(rootAsItem));
 
   nsCOMPtr<nsIDocShellTreeItem> childItem;
-  rootAsItem->FindChildWithName(MOZ_UTF16("content"), true,
+  rootAsItem->FindChildWithName(u"content", true,
 				false, nullptr, nullptr,
 				getter_AddRefs(childItem));
 
@@ -311,7 +311,7 @@ nsMsgPrintEngine::StartPrintOperation(nsIPrintSettings* aPS)
   mPrintSettings = aPS;
 
   // Load the about:blank on the tail end...
-  nsresult rv = AddPrintURI(MOZ_UTF16("about:blank")); 
+  nsresult rv = AddPrintURI(u"about:blank"); 
   if (NS_FAILED(rv)) return rv; 
   return StartNextPrintOperation();
 }
@@ -377,9 +377,9 @@ nsMsgPrintEngine::ShowProgressDialog(bool aIsForPrinting, bool& aDoNotify)
           NS_ADDREF(wpl);
           nsString msg;
           if (mIsDoingPrintPreview) {
-            GetString(MOZ_UTF16("LoadingMailMsgForPrintPreview"), msg);
+            GetString(u"LoadingMailMsgForPrintPreview", msg);
           } else {
-            GetString(MOZ_UTF16("LoadingMailMsgForPrint"), msg);
+            GetString(u"LoadingMailMsgForPrint", msg);
           }
           if (!msg.IsEmpty()) 
             mPrintProgressParams->SetDocTitle(msg.get());
@@ -411,7 +411,7 @@ nsMsgPrintEngine::StartNextPrintOperation()
 
     // Tell the user we are done...
     nsString msg;
-    GetString(MOZ_UTF16("PrintingComplete"), msg);
+    GetString(u"PrintingComplete", msg);
     SetStatusMessage(msg);
     return NS_OK;
   }
@@ -599,7 +599,7 @@ nsMsgPrintEngine::PrintMsgWindow()
       // for mail, it can review the salt.  for addrbook, it's a data:// url, which
       // means nothing to the end user.
       // needs to be " " and not "" or nullptr, otherwise, we'll still print the url
-      mPrintSettings->SetDocURL(MOZ_UTF16(" "));
+      mPrintSettings->SetDocURL(u" ");
 
       nsresult rv = NS_ERROR_FAILURE;
       if (mIsDoingPrintPreview) 
diff --git a/mailnews/base/src/nsMsgStatusFeedback.cpp b/mailnews/base/src/nsMsgStatusFeedback.cpp
index 1702f3066e..7843886edd 100644
--- a/mailnews/base/src/nsMsgStatusFeedback.cpp
+++ b/mailnews/base/src/nsMsgStatusFeedback.cpp
@@ -87,7 +87,7 @@ nsMsgStatusFeedback::OnStateChange(nsIWebProgress* aWebProgress,
       m_lastPercent = 0;
       StartMeteors();
       nsString loadingDocument;
-      rv = mBundle->GetStringFromName(MOZ_UTF16("documentLoading"),
+      rv = mBundle->GetStringFromName(u"documentLoading",
                                       getter_Copies(loadingDocument));
       if (NS_SUCCEEDED(rv))
         ShowStatusString(loadingDocument);
@@ -141,7 +141,7 @@ nsMsgStatusFeedback::OnStateChange(nsIWebProgress* aWebProgress,
       }
       StopMeteors();
       nsString documentDone;
-      rv = mBundle->GetStringFromName(MOZ_UTF16("documentDone"),
+      rv = mBundle->GetStringFromName(u"documentDone",
                                       getter_Copies(documentDone));
       if (NS_SUCCEEDED(rv))
         ShowStatusString(documentDone);
@@ -291,7 +291,7 @@ NS_IMETHODIMP nsMsgStatusFeedback::OnStatus(nsIRequest *request, nsISupports* ct
     const char16_t *params[] = { accountName.get(),
                                   str.get() };
     rv = bundle->FormatStringFromName(
-      MOZ_UTF16("statusMessage"),
+      u"statusMessage",
       params, 2, getter_Copies(statusMessage));
     NS_ENSURE_SUCCESS(rv, rv);
   }
diff --git a/mailnews/base/src/nsMsgWindow.cpp b/mailnews/base/src/nsMsgWindow.cpp
index 0c0a0e2c8f..b8cc75c640 100644
--- a/mailnews/base/src/nsMsgWindow.cpp
+++ b/mailnews/base/src/nsMsgWindow.cpp
@@ -86,7 +86,7 @@ NS_IMETHODIMP nsMsgWindow::GetMessageWindowDocShell(nsIDocShell ** aDocShell)
     {
       nsCOMPtr<nsIDocShellTreeItem> msgDocShellItem;
       if(rootShell)
-         rootShell->FindChildWithName(MOZ_UTF16("messagepane"),
+         rootShell->FindChildWithName(u"messagepane",
                                       true, false, nullptr, nullptr,
                                       getter_AddRefs(msgDocShellItem));
       NS_ENSURE_TRUE(msgDocShellItem, NS_ERROR_FAILURE);
diff --git a/mailnews/base/src/nsSpamSettings.cpp b/mailnews/base/src/nsSpamSettings.cpp
index fe7aa68d47..e8318b75af 100644
--- a/mailnews/base/src/nsSpamSettings.cpp
+++ b/mailnews/base/src/nsSpamSettings.cpp
@@ -685,7 +685,7 @@ NS_IMETHODIMP nsSpamSettings::LogJunkHit(nsIMsgDBHdr *aMsgHdr, bool aMoveMessage
   const char16_t *junkLogDetectFormatStrings[3] = { authorValue.get(), subjectValue.get(), dateValue.get() };
   nsString junkLogDetectStr;
   rv = bundle->FormatStringFromName(
-    MOZ_UTF16("junkLogDetectStr"),
+    u"junkLogDetectStr",
     junkLogDetectFormatStrings, 3,
     getter_Copies(junkLogDetectStr));
   NS_ENSURE_SUCCESS(rv, rv);
@@ -707,7 +707,7 @@ NS_IMETHODIMP nsSpamSettings::LogJunkHit(nsIMsgDBHdr *aMsgHdr, bool aMoveMessage
     const char16_t *logMoveFormatStrings[2] = { msgIdValue.get(), junkFolderURIValue.get() };
     nsString logMoveStr;
     rv = bundle->FormatStringFromName(
-      MOZ_UTF16("logMoveStr"),
+      u"logMoveStr",
       logMoveFormatStrings, 2,
       getter_Copies(logMoveStr));
     NS_ENSURE_SUCCESS(rv, rv);
diff --git a/mailnews/base/src/nsSubscribableServer.cpp b/mailnews/base/src/nsSubscribableServer.cpp
index 70e76b75c7..0178c0e4a0 100644
--- a/mailnews/base/src/nsSubscribableServer.cpp
+++ b/mailnews/base/src/nsSubscribableServer.cpp
@@ -40,10 +40,10 @@ nsSubscribableServer::Init()
                                   getter_AddRefs(kNC_Subscribed));
     NS_ENSURE_SUCCESS(rv,rv);
 
-    rv = mRDFService->GetLiteral(MOZ_UTF16("true"), getter_AddRefs(kTrueLiteral));
+    rv = mRDFService->GetLiteral(u"true", getter_AddRefs(kTrueLiteral));
     NS_ENSURE_SUCCESS(rv,rv);
 
-    rv = mRDFService->GetLiteral(MOZ_UTF16("false"), getter_AddRefs(kFalseLiteral));
+    rv = mRDFService->GetLiteral(u"false", getter_AddRefs(kFalseLiteral));
     NS_ENSURE_SUCCESS(rv,rv);
     return NS_OK;
 }
diff --git a/mailnews/base/src/nsSubscribeDataSource.cpp b/mailnews/base/src/nsSubscribeDataSource.cpp
index b00d0e5b04..06c9ece981 100644
--- a/mailnews/base/src/nsSubscribeDataSource.cpp
+++ b/mailnews/base/src/nsSubscribeDataSource.cpp
@@ -67,10 +67,10 @@ nsSubscribeDataSource::Init()
                                   getter_AddRefs(kNC_ServerType));
     NS_ENSURE_SUCCESS(rv,rv);
 
-    rv = mRDFService->GetLiteral(MOZ_UTF16("true"), getter_AddRefs(kTrueLiteral));
+    rv = mRDFService->GetLiteral(u"true", getter_AddRefs(kTrueLiteral));
     NS_ENSURE_SUCCESS(rv,rv);
 
-    rv = mRDFService->GetLiteral(MOZ_UTF16("false"), getter_AddRefs(kFalseLiteral));
+    rv = mRDFService->GetLiteral(u"false", getter_AddRefs(kFalseLiteral));
     NS_ENSURE_SUCCESS(rv,rv);
 	return NS_OK;
 }
diff --git a/mailnews/base/util/nsMsgDBFolder.cpp b/mailnews/base/util/nsMsgDBFolder.cpp
index 2436f6a1b8..4e7fb010df 100644
--- a/mailnews/base/util/nsMsgDBFolder.cpp
+++ b/mailnews/base/util/nsMsgDBFolder.cpp
@@ -1927,15 +1927,15 @@ nsresult nsMsgDBFolder::HandleAutoCompactEvent(nsIMsgWindow *aWindow)
           nsAutoString compactSize;
           FormatFileSize(totalExpungedBytes, true, compactSize);
           const char16_t* params[] = { compactSize.get() };
-          rv = bundle->GetStringFromName(MOZ_UTF16("autoCompactAllFoldersTitle"), getter_Copies(dialogTitle));
+          rv = bundle->GetStringFromName(u"autoCompactAllFoldersTitle", getter_Copies(dialogTitle));
           NS_ENSURE_SUCCESS(rv, rv);
-          rv = bundle->FormatStringFromName(MOZ_UTF16("autoCompactAllFoldersText"),
+          rv = bundle->FormatStringFromName(u"autoCompactAllFoldersText",
                                             params, 1, getter_Copies(confirmString));
           NS_ENSURE_SUCCESS(rv, rv);
-          rv = bundle->GetStringFromName(MOZ_UTF16("autoCompactAlwaysAskCheckbox"),
+          rv = bundle->GetStringFromName(u"autoCompactAlwaysAskCheckbox",
                                          getter_Copies(checkboxText));
           NS_ENSURE_SUCCESS(rv, rv);
-          rv = bundle->GetStringFromName(MOZ_UTF16("compactNowButton"),
+          rv = bundle->GetStringFromName(u"compactNowButton",
                                          getter_Copies(buttonCompactNowText));
           NS_ENSURE_SUCCESS(rv, rv);
           bool alwaysAsk = true; // "Always ask..." - checked by default.
@@ -2931,27 +2931,27 @@ nsMsgDBFolder::initializeStrings()
                                    getter_AddRefs(bundle));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  bundle->GetStringFromName(MOZ_UTF16("inboxFolderName"),
+  bundle->GetStringFromName(u"inboxFolderName",
                             &kLocalizedInboxName);
-  bundle->GetStringFromName(MOZ_UTF16("trashFolderName"),
+  bundle->GetStringFromName(u"trashFolderName",
                             &kLocalizedTrashName);
-  bundle->GetStringFromName(MOZ_UTF16("sentFolderName"),
+  bundle->GetStringFromName(u"sentFolderName",
                             &kLocalizedSentName);
-  bundle->GetStringFromName(MOZ_UTF16("draftsFolderName"),
+  bundle->GetStringFromName(u"draftsFolderName",
                             &kLocalizedDraftsName);
-  bundle->GetStringFromName(MOZ_UTF16("templatesFolderName"),
+  bundle->GetStringFromName(u"templatesFolderName",
                             &kLocalizedTemplatesName);
-  bundle->GetStringFromName(MOZ_UTF16("junkFolderName"),
+  bundle->GetStringFromName(u"junkFolderName",
                             &kLocalizedJunkName);
-  bundle->GetStringFromName(MOZ_UTF16("outboxFolderName"),
+  bundle->GetStringFromName(u"outboxFolderName",
                             &kLocalizedUnsentName);
-  bundle->GetStringFromName(MOZ_UTF16("archivesFolderName"),
+  bundle->GetStringFromName(u"archivesFolderName",
                             &kLocalizedArchivesName);
 
   nsCOMPtr<nsIStringBundle> brandBundle;
   rv = bundleService->CreateBundle("chrome://branding/locale/brand.properties", getter_AddRefs(bundle));
   NS_ENSURE_SUCCESS(rv, rv);
-  bundle->GetStringFromName(MOZ_UTF16("brandShortName"),
+  bundle->GetStringFromName(u"brandShortName",
                             &kLocalizedBrandShortName);
   return NS_OK;
 }
@@ -3851,7 +3851,7 @@ nsMsgDBFolder::ConfirmAutoFolderRename(nsIMsgWindow *msgWindow,
   };
 
   nsString confirmString;
-  rv = bundle->FormatStringFromName(MOZ_UTF16("confirmDuplicateFolderRename"),
+  rv = bundle->FormatStringFromName(u"confirmDuplicateFolderRename",
                                     formatStrings, 3, getter_Copies(confirmString));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return false;
diff --git a/mailnews/base/util/nsMsgI18N.cpp b/mailnews/base/util/nsMsgI18N.cpp
index 8ba0aef8f3..b39a3f4ab1 100644
--- a/mailnews/base/util/nsMsgI18N.cpp
+++ b/mailnews/base/util/nsMsgI18N.cpp
@@ -258,7 +258,7 @@ bool nsMsgI18Nmultibyte_charset(const char *charset)
 
   if (NS_SUCCEEDED(res)) {
     nsAutoString charsetData;
-    res = ccm->GetCharsetData(charset, MOZ_UTF16(".isMultibyte"), charsetData);
+    res = ccm->GetCharsetData(charset, u".isMultibyte", charsetData);
     if (NS_SUCCEEDED(res)) {
       result = charsetData.LowerCaseEqualsLiteral("true");
     }
diff --git a/mailnews/base/util/nsMsgIncomingServer.cpp b/mailnews/base/util/nsMsgIncomingServer.cpp
index 3417d52ffe..9eb96e54ba 100644
--- a/mailnews/base/util/nsMsgIncomingServer.cpp
+++ b/mailnews/base/util/nsMsgIncomingServer.cpp
@@ -1619,8 +1619,8 @@ NS_IMETHODIMP nsMsgIncomingServer::DisplayOfflineMsg(nsIMsgWindow *aMsgWindow)
   {
     nsString errorMsgTitle;
     nsString errorMsgBody;
-    bundle->GetStringFromName(MOZ_UTF16("nocachedbodybody2"), getter_Copies(errorMsgBody));
-    bundle->GetStringFromName(MOZ_UTF16("nocachedbodytitle"), getter_Copies(errorMsgTitle));
+    bundle->GetStringFromName(u"nocachedbodybody2", getter_Copies(errorMsgBody));
+    bundle->GetStringFromName(u"nocachedbodytitle", getter_Copies(errorMsgTitle));
     aMsgWindow->DisplayHTMLInMessagePane(errorMsgTitle, errorMsgBody, true);
   }
 
diff --git a/mailnews/base/util/nsMsgProtocol.cpp b/mailnews/base/util/nsMsgProtocol.cpp
index d17cf608de..62551f1b59 100644
--- a/mailnews/base/util/nsMsgProtocol.cpp
+++ b/mailnews/base/util/nsMsgProtocol.cpp
@@ -356,14 +356,14 @@ NS_IMETHODIMP nsMsgProtocol::OnStopRequest(nsIRequest *request, nsISupports *ctx
       {
           case NS_ERROR_UNKNOWN_HOST:
           case NS_ERROR_UNKNOWN_PROXY_HOST:
-             errorString = MOZ_UTF16("unknownHostError");
+             errorString = u"unknownHostError";
              break;
           case NS_ERROR_CONNECTION_REFUSED:
           case NS_ERROR_PROXY_CONNECTION_REFUSED:
-             errorString = MOZ_UTF16("connectionRefusedError");
+             errorString = u"connectionRefusedError";
              break;
           case NS_ERROR_NET_TIMEOUT:
-             errorString = MOZ_UTF16("netTimeoutError");
+             errorString = u"netTimeoutError";
              break;
           default:
              // Leave the string as nullptr.
diff --git a/mailnews/base/util/nsMsgUtils.cpp b/mailnews/base/util/nsMsgUtils.cpp
index 004ed579dd..c3b6c8b030 100644
--- a/mailnews/base/util/nsMsgUtils.cpp
+++ b/mailnews/base/util/nsMsgUtils.cpp
@@ -2163,25 +2163,25 @@ NS_MSG_BASE nsresult MsgPromptLoginFailed(nsIMsgWindow *aMsgWindow,
   NS_ConvertUTF8toUTF16 hostNameUTF16(aHostname);
   const char16_t *formatStrings[] = { hostNameUTF16.get() };
 
-  rv = bundle->FormatStringFromName(MOZ_UTF16("mailServerLoginFailed"),
+  rv = bundle->FormatStringFromName(u"mailServerLoginFailed",
                                     formatStrings, 1,
                                     getter_Copies(message));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsString title;
   rv = bundle->GetStringFromName(
-    MOZ_UTF16("mailServerLoginFailedTitle"), getter_Copies(title));
+    u"mailServerLoginFailedTitle", getter_Copies(title));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsString button0;
   rv = bundle->GetStringFromName(
-    MOZ_UTF16("mailServerLoginFailedRetryButton"),
+    u"mailServerLoginFailedRetryButton",
     getter_Copies(button0));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsString button2;
   rv = bundle->GetStringFromName(
-    MOZ_UTF16("mailServerLoginFailedEnterNewPasswordButton"),
+    u"mailServerLoginFailedEnterNewPasswordButton",
     getter_Copies(button2));
   NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/mailnews/compose/src/nsComposeStrings.cpp b/mailnews/compose/src/nsComposeStrings.cpp
index 9ef4322960..1d50c355ae 100644
--- a/mailnews/compose/src/nsComposeStrings.cpp
+++ b/mailnews/compose/src/nsComposeStrings.cpp
@@ -9,100 +9,100 @@ const char16_t* errorStringNameForErrorCode(nsresult aCode)
   switch(aCode)
   {
     case NS_MSG_UNABLE_TO_OPEN_FILE:
-      return MOZ_UTF16("unableToOpenFile");
+      return u"unableToOpenFile";
     case NS_MSG_UNABLE_TO_OPEN_TMP_FILE:
-      return MOZ_UTF16("unableToOpenTmpFile");
+      return u"unableToOpenTmpFile";
     case NS_MSG_UNABLE_TO_SAVE_TEMPLATE:
-      return MOZ_UTF16("unableToSaveTemplate");
+      return u"unableToSaveTemplate";
     case NS_MSG_UNABLE_TO_SAVE_DRAFT:
-      return MOZ_UTF16("unableToSaveDraft");
+      return u"unableToSaveDraft";
     case NS_MSG_COULDNT_OPEN_FCC_FOLDER:
-      return MOZ_UTF16("couldntOpenFccFolder");
+      return u"couldntOpenFccFolder";
     case NS_MSG_NO_SENDER:
-      return MOZ_UTF16("noSender");
+      return u"noSender";
     case NS_MSG_NO_RECIPIENTS:
-      return MOZ_UTF16("noRecipients");
+      return u"noRecipients";
     case NS_MSG_ERROR_WRITING_FILE:
-      return MOZ_UTF16("errorWritingFile");
+      return u"errorWritingFile";
     case NS_ERROR_SENDING_FROM_COMMAND:
-      return MOZ_UTF16("errorSendingFromCommand");
+      return u"errorSendingFromCommand";
     case NS_ERROR_SENDING_DATA_COMMAND:
-      return MOZ_UTF16("errorSendingDataCommand");
+      return u"errorSendingDataCommand";
     case NS_ERROR_SENDING_MESSAGE:
-      return MOZ_UTF16("errorSendingMessage");
+      return u"errorSendingMessage";
     case NS_ERROR_POST_FAILED:
-      return MOZ_UTF16("postFailed");
+      return u"postFailed";
     case NS_ERROR_QUEUED_DELIVERY_FAILED:
-      return MOZ_UTF16("errorQueuedDeliveryFailed");
+      return u"errorQueuedDeliveryFailed";
     case NS_ERROR_SEND_FAILED:
-      return MOZ_UTF16("sendFailed");
+      return u"sendFailed";
     case NS_ERROR_SMTP_SERVER_ERROR:
-      return MOZ_UTF16("smtpServerError");
+      return u"smtpServerError";
     case NS_MSG_UNABLE_TO_SEND_LATER:
-      return MOZ_UTF16("unableToSendLater");
+      return u"unableToSendLater";
     case NS_ERROR_COMMUNICATIONS_ERROR:
-      return MOZ_UTF16("communicationsError");
+      return u"communicationsError";
     case NS_ERROR_BUT_DONT_SHOW_ALERT:
-      return MOZ_UTF16("dontShowAlert");
+      return u"dontShowAlert";
     case NS_ERROR_TCP_READ_ERROR:
-      return MOZ_UTF16("tcpReadError");
+      return u"tcpReadError";
     case NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS:
-      return MOZ_UTF16("couldNotGetUsersMailAddress");
+      return u"couldNotGetUsersMailAddress";
     case NS_ERROR_MIME_MPART_ATTACHMENT_ERROR:
-      return MOZ_UTF16("mimeMpartAttachmentError");
+      return u"mimeMpartAttachmentError";
     case NS_MSG_FAILED_COPY_OPERATION:
-      return MOZ_UTF16("failedCopyOperation");
+      return u"failedCopyOperation";
     case NS_ERROR_NNTP_NO_CROSS_POSTING:
-      return MOZ_UTF16("nntpNoCrossPosting");
+      return u"nntpNoCrossPosting";
     case NS_MSG_CANCELLING:
-      return MOZ_UTF16("msgCancelling");
+      return u"msgCancelling";
     case NS_ERROR_SEND_FAILED_BUT_NNTP_OK:
-      return MOZ_UTF16("sendFailedButNntpOk");
+      return u"sendFailedButNntpOk";
     case NS_MSG_ERROR_READING_FILE:
-      return MOZ_UTF16("errorReadingFile");
+      return u"errorReadingFile";
     case NS_MSG_ERROR_ATTACHING_FILE:
-      return MOZ_UTF16("errorAttachingFile");
+      return u"errorAttachingFile";
     case NS_ERROR_SMTP_GREETING:
-      return MOZ_UTF16("incorrectSmtpGreeting");
+      return u"incorrectSmtpGreeting";
     case NS_ERROR_SENDING_RCPT_COMMAND:
-      return MOZ_UTF16("errorSendingRcptCommand");
+      return u"errorSendingRcptCommand";
     case NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS:
-      return MOZ_UTF16("startTlsFailed");
+      return u"startTlsFailed";
     case NS_ERROR_SMTP_PASSWORD_UNDEFINED:
-      return MOZ_UTF16("smtpPasswordUndefined");
+      return u"smtpPasswordUndefined";
     case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
-      return MOZ_UTF16("smtpTempSizeExceeded");
+      return u"smtpTempSizeExceeded";
     case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
-      return MOZ_UTF16("smtpPermSizeExceeded1");
+      return u"smtpPermSizeExceeded1";
     case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
-      return MOZ_UTF16("smtpPermSizeExceeded2");
+      return u"smtpPermSizeExceeded2";
     case NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER:
-      return MOZ_UTF16("smtpSendFailedUnknownServer");
+      return u"smtpSendFailedUnknownServer";
     case NS_ERROR_SMTP_SEND_FAILED_REFUSED:
-      return MOZ_UTF16("smtpSendRequestRefused");
+      return u"smtpSendRequestRefused";
     case NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED:
-      return MOZ_UTF16("smtpSendInterrupted");
+      return u"smtpSendInterrupted";
     case NS_ERROR_SMTP_SEND_FAILED_TIMEOUT:
-      return MOZ_UTF16("smtpSendTimeout");
+      return u"smtpSendTimeout";
     case NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON:
-      return MOZ_UTF16("smtpSendFailedUnknownReason");
+      return u"smtpSendFailedUnknownReason";
     case NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL:
-      return MOZ_UTF16("smtpHintAuthEncryptToPlainNoSsl");
+      return u"smtpHintAuthEncryptToPlainNoSsl";
     case NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL:
-      return MOZ_UTF16("smtpHintAuthEncryptToPlainSsl");
+      return u"smtpHintAuthEncryptToPlainSsl";
     case NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT:
-      return MOZ_UTF16("smtpHintAuthPlainToEncrypt");
+      return u"smtpHintAuthPlainToEncrypt";
     case NS_ERROR_SMTP_AUTH_FAILURE:
-      return MOZ_UTF16("smtpAuthFailure");
+      return u"smtpAuthFailure";
     case NS_ERROR_SMTP_AUTH_GSSAPI:
-      return MOZ_UTF16("smtpAuthGssapi");
+      return u"smtpAuthGssapi";
     case NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED:
-      return MOZ_UTF16("smtpAuthMechNotSupported");
+      return u"smtpAuthMechNotSupported";
     case NS_ERROR_SMTP_AUTH_NOT_SUPPORTED:
-      return MOZ_UTF16("smtpAuthenticationNotSupported");
+      return u"smtpAuthenticationNotSupported";
     case NS_ERROR_ILLEGAL_LOCALPART:
-      return MOZ_UTF16("illegalLocalPart");
+      return u"illegalLocalPart";
     default:
-      return MOZ_UTF16("sendFailed");
+      return u"sendFailed";
   }
 }
diff --git a/mailnews/compose/src/nsMsgAttachmentHandler.cpp b/mailnews/compose/src/nsMsgAttachmentHandler.cpp
index dce338804c..e393f8737d 100644
--- a/mailnews/compose/src/nsMsgAttachmentHandler.cpp
+++ b/mailnews/compose/src/nsMsgAttachmentHandler.cpp
@@ -1169,10 +1169,10 @@ nsMsgAttachmentHandler::UrlExit(nsresult status, const char16_t* aMsg)
     NS_ConvertUTF8toUTF16 UTF16params(params);
     const char16_t* formatParams[] = { UTF16params.get() };
     if (mode == nsIMsgSend::nsMsgSaveAsDraft || mode == nsIMsgSend::nsMsgSaveAsTemplate)
-      bundle->FormatStringFromName(MOZ_UTF16("failureOnObjectEmbeddingWhileSaving"),
+      bundle->FormatStringFromName(u"failureOnObjectEmbeddingWhileSaving",
                                    formatParams, 1, getter_Copies(msg));
     else
-      bundle->FormatStringFromName(MOZ_UTF16("failureOnObjectEmbeddingWhileSending"),
+      bundle->FormatStringFromName(u"failureOnObjectEmbeddingWhileSending",
                                    formatParams, 1, getter_Copies(msg));
 
     nsCOMPtr<nsIPrompt> aPrompt;
diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp
index 034544e6f7..ce31e3316c 100644
--- a/mailnews/compose/src/nsMsgCompUtils.cpp
+++ b/mailnews/compose/src/nsMsgCompUtils.cpp
@@ -445,7 +445,7 @@ nsresult mime_generate_headers(nsIMsgCompFields *fields,
           if (NS_SUCCEEDED(rv))
           {
             nsString undisclosedRecipients;
-            rv = composeStringBundle->GetStringFromName(MOZ_UTF16("undisclosedRecipients"),
+            rv = composeStringBundle->GetStringFromName(u"undisclosedRecipients",
                                                         getter_Copies(undisclosedRecipients));
             if (NS_SUCCEEDED(rv) && !undisclosedRecipients.IsEmpty())
             {
diff --git a/mailnews/compose/src/nsMsgCompose.cpp b/mailnews/compose/src/nsMsgCompose.cpp
index e92a824998..5cf3dab249 100644
--- a/mailnews/compose/src/nsMsgCompose.cpp
+++ b/mailnews/compose/src/nsMsgCompose.cpp
@@ -1455,18 +1455,18 @@ NS_IMETHODIMP nsMsgCompose::SendMsg(MSG_DeliverMode deliverMode, nsIMsgIdentity
       switch (deliverMode)
       {
         case nsIMsgCompDeliverMode::Later:
-          nsMsgDisplayMessageByName(prompt, MOZ_UTF16("unableToSendLater"));
+          nsMsgDisplayMessageByName(prompt, u"unableToSendLater");
           break;
         case nsIMsgCompDeliverMode::AutoSaveAsDraft:
         case nsIMsgCompDeliverMode::SaveAsDraft:
-          nsMsgDisplayMessageByName(prompt, MOZ_UTF16("unableToSaveDraft"));
+          nsMsgDisplayMessageByName(prompt, u"unableToSaveDraft");
           break;
         case nsIMsgCompDeliverMode::SaveAsTemplate:
-          nsMsgDisplayMessageByName(prompt, MOZ_UTF16("unableToSaveTemplate"));
+          nsMsgDisplayMessageByName(prompt, u"unableToSaveTemplate");
           break;
 
         default:
-          nsMsgDisplayMessageByName(prompt, MOZ_UTF16("sendFailed"));
+          nsMsgDisplayMessageByName(prompt, u"sendFailed");
           break;
       }
     }
@@ -2109,7 +2109,7 @@ nsresult nsMsgCompose::CreateMessage(const char * originalMsgURI,
                 rv = bundleService->CreateBundle("chrome://messenger/locale/messengercompose/composeMsgs.properties",
                                                  getter_AddRefs(composeBundle));
                 NS_ENSURE_SUCCESS(rv, rv);
-                composeBundle->GetStringFromName(MOZ_UTF16("messageAttachmentSafeName"),
+                composeBundle->GetStringFromName(u"messageAttachmentSafeName",
                                                  getter_Copies(sanitizedSubj));
               }
               else
@@ -2770,7 +2770,7 @@ NS_IMETHODIMP QuotingOutputStreamListener::OnStopRequest(nsIRequest *request, ns
           nsCOMPtr<nsPIDOMWindowOuter> composeWindow = nsPIDOMWindowOuter::From(domWindow);
           if (composeWindow)
             composeWindow->GetPrompter(getter_AddRefs(prompt));
-          nsMsgDisplayMessageByName(prompt, MOZ_UTF16("followupToSenderMessage"));
+          nsMsgDisplayMessageByName(prompt, u"followupToSenderMessage");
 
           if (!replyTo.IsEmpty())
           {
@@ -4031,7 +4031,7 @@ NS_IMETHODIMP nsMsgComposeSendListener::OnStateChange(nsIWebProgress *aWebProgre
             getter_AddRefs(bundle));
           NS_ENSURE_SUCCESS(rv, rv);
           nsString msg;
-          bundle->GetStringFromName(MOZ_UTF16("msgCancelling"), getter_Copies(msg));
+          bundle->GetStringFromName(u"msgCancelling", getter_Copies(msg));
           progress->OnStatusChange(nullptr, nullptr, NS_OK, msg.get());
         }
       }
diff --git a/mailnews/compose/src/nsMsgComposeService.cpp b/mailnews/compose/src/nsMsgComposeService.cpp
index ced9ff3773..28675d0d0a 100644
--- a/mailnews/compose/src/nsMsgComposeService.cpp
+++ b/mailnews/compose/src/nsMsgComposeService.cpp
@@ -269,7 +269,7 @@ nsMsgComposeService::GetOrigWindowSelection(MSG_ComposeType type, nsIMsgWindow *
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIDocShellTreeItem> childAsItem;
-  rv = rootDocShell->FindChildWithName(MOZ_UTF16("messagepane"),
+  rv = rootDocShell->FindChildWithName(u"messagepane",
                                        true, false, nullptr, nullptr, getter_AddRefs(childAsItem));
   NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/mailnews/compose/src/nsMsgPrompts.cpp b/mailnews/compose/src/nsMsgPrompts.cpp
index 8db1f9632d..473469f16d 100644
--- a/mailnews/compose/src/nsMsgPrompts.cpp
+++ b/mailnews/compose/src/nsMsgPrompts.cpp
@@ -54,13 +54,13 @@ nsMsgBuildMessageByName(const char16_t *aName, nsIFile *aFile, nsString& aResult
 nsresult
 nsMsgBuildMessageWithFile(nsIFile *aFile, nsString& aResult)
 {
-  return nsMsgBuildMessageByName(MOZ_UTF16("unableToOpenFile"), aFile, aResult);
+  return nsMsgBuildMessageByName(u"unableToOpenFile", aFile, aResult);
 }
 
 nsresult
 nsMsgBuildMessageWithTmpFile(nsIFile *aFile, nsString& aResult)
 {
-  return nsMsgBuildMessageByName(MOZ_UTF16("unableToOpenTmpFile"), aFile, aResult);
+  return nsMsgBuildMessageByName(u"unableToOpenTmpFile", aFile, aResult);
 }
 
 nsresult
diff --git a/mailnews/compose/src/nsMsgSend.cpp b/mailnews/compose/src/nsMsgSend.cpp
index 9207c28afd..3803b2918a 100644
--- a/mailnews/compose/src/nsMsgSend.cpp
+++ b/mailnews/compose/src/nsMsgSend.cpp
@@ -561,7 +561,7 @@ nsMsgComposeAndSend::GatherMimeAttachments()
 
   NS_ASSERTION (m_attachment_pending_count == 0, "m_attachment_pending_count != 0");
 
-  mComposeBundle->GetStringFromName(MOZ_UTF16("assemblingMessage"),
+  mComposeBundle->GetStringFromName(u"assemblingMessage",
                                     getter_Copies(msg));
   SetStatusMessage( msg );
 
@@ -928,7 +928,7 @@ nsMsgComposeAndSend::GatherMimeAttachments()
   }
 
   // Tell the user we are creating the message...
-  mComposeBundle->GetStringFromName(MOZ_UTF16("creatingMailMessage"),
+  mComposeBundle->GetStringFromName(u"creatingMailMessage",
                                     getter_Copies(msg));
   SetStatusMessage( msg );
 
@@ -971,7 +971,7 @@ nsMsgComposeAndSend::GatherMimeAttachments()
     }
   }
 
-  mComposeBundle->GetStringFromName(MOZ_UTF16("assemblingMessageDone"),
+  mComposeBundle->GetStringFromName(u"assemblingMessageDone",
                                     getter_Copies(msg));
   SetStatusMessage(msg);
 
@@ -2521,7 +2521,7 @@ nsMsgComposeAndSend::HackAttachments(nsIArray *attachments,
         attachmentFileName.AssignASCII(asciiSpec.get());
         formatParams[0] = attachmentFileName.get();
       }
-      mComposeBundle->FormatStringFromName(MOZ_UTF16("gatheringAttachment"),
+      mComposeBundle->FormatStringFromName(u"gatheringAttachment",
                                            formatParams, 1, getter_Copies(msg));
 
       if (!msg.IsEmpty())
@@ -2549,7 +2549,7 @@ nsMsgComposeAndSend::HackAttachments(nsIArray *attachments,
         {
           nsCOMPtr<nsIStringBundle> bundle;
           const char16_t *params[] = { attachmentFileName.get() };
-          mComposeBundle->FormatStringFromName(MOZ_UTF16("errorAttachingFile"),
+          mComposeBundle->FormatStringFromName(u"errorAttachingFile",
                                                params, 1,
                                                getter_Copies(errorMsg));
           mSendReport->SetMessage(nsIMsgSendReport::process_Current, errorMsg.get(), false);
@@ -3041,7 +3041,7 @@ nsMsgComposeAndSend::Init(
   }
 
   // Tell the user we are assembling the message...
-  mComposeBundle->GetStringFromName(MOZ_UTF16("assemblingMailInformation"), getter_Copies(msg));
+  mComposeBundle->GetStringFromName(u"assemblingMailInformation", getter_Copies(msg));
   SetStatusMessage(msg);
   if (mSendReport)
     mSendReport->SetCurrentProcess(nsIMsgSendReport::process_BuildMessage);
@@ -3236,7 +3236,7 @@ nsMsgComposeAndSend::DeliverMessage()
     nsAutoString formattedFileSize;
     FormatFileSize(fileSize, true, formattedFileSize);
     const char16_t* params[] = { formattedFileSize.get() };
-    mComposeBundle->FormatStringFromName(MOZ_UTF16("largeMessageSendWarning"),
+    mComposeBundle->FormatStringFromName(u"largeMessageSendWarning",
                                          params, 1, getter_Copies(msg));
 
     if (!msg.IsEmpty())
@@ -3395,7 +3395,7 @@ nsMsgComposeAndSend::DeliverFileAsMail()
 
     // Tell the user we are sending the message!
     nsString msg;
-    mComposeBundle->GetStringFromName(MOZ_UTF16("sendingMessage"), getter_Copies(msg));
+    mComposeBundle->GetStringFromName(u"sendingMessage", getter_Copies(msg));
     SetStatusMessage(msg);
     nsCOMPtr<nsIMsgStatusFeedback> msgStatus (do_QueryInterface(mSendProgress));
     // if the sendProgress isn't set, let's use the member variable.
@@ -3444,7 +3444,7 @@ nsMsgComposeAndSend::DeliverFileAsNews()
 
     // Tell the user we are posting the message!
     nsString msg;
-    mComposeBundle->GetStringFromName(MOZ_UTF16("postingMessage"),
+    mComposeBundle->GetStringFromName(u"postingMessage",
                                       getter_Copies(msg));
     SetStatusMessage(msg);
 
@@ -3494,7 +3494,7 @@ nsMsgComposeAndSend::Fail(nsresult aFailureCode, const char16_t *aErrorMsg,
     else
     {
       if (aFailureCode != NS_ERROR_BUT_DONT_SHOW_ALERT)
-        nsMsgDisplayMessageByName(prompt, MOZ_UTF16("sendFailed"));
+        nsMsgDisplayMessageByName(prompt, u"sendFailed");
     }
   }
 
@@ -3802,9 +3802,9 @@ nsMsgComposeAndSend::NotifyListenerOnStopCopy(nsresult aStatus)
   // Set a status message...
   nsString msg;
   if (NS_SUCCEEDED(aStatus))
-    mComposeBundle->GetStringFromName(MOZ_UTF16("copyMessageComplete"), getter_Copies(msg));
+    mComposeBundle->GetStringFromName(u"copyMessageComplete", getter_Copies(msg));
   else
-    mComposeBundle->GetStringFromName(MOZ_UTF16("copyMessageFailed"), getter_Copies(msg));
+    mComposeBundle->GetStringFromName(u"copyMessageFailed", getter_Copies(msg));
 
   SetStatusMessage(msg);
   nsCOMPtr<nsIPrompt> prompt;
@@ -3823,7 +3823,7 @@ nsMsgComposeAndSend::NotifyListenerOnStopCopy(nsresult aStatus)
     nsString msg;
     const char16_t *formatStrings[] = { mSavedToFolderName.get() };
 
-    rv = bundle->FormatStringFromName(MOZ_UTF16("errorSavingMsg"),
+    rv = bundle->FormatStringFromName(u"errorSavingMsg",
                                       formatStrings, 1,
                                       getter_Copies(msg));
     if (NS_SUCCEEDED(rv))
@@ -3897,15 +3897,15 @@ nsMsgComposeAndSend::OnStopOperation(nsresult aStatus)
   // Set a status message...
   nsString msg;
   if (NS_SUCCEEDED(aStatus))
-    mComposeBundle->GetStringFromName(MOZ_UTF16("filterMessageComplete"), getter_Copies(msg));
+    mComposeBundle->GetStringFromName(u"filterMessageComplete", getter_Copies(msg));
   else
-    mComposeBundle->GetStringFromName(MOZ_UTF16("filterMessageFailed"), getter_Copies(msg));
+    mComposeBundle->GetStringFromName(u"filterMessageFailed", getter_Copies(msg));
 
   SetStatusMessage(msg);
 
   if (NS_FAILED(aStatus))
   {
-    nsresult rv = mComposeBundle->GetStringFromName(MOZ_UTF16("errorFilteringMsg"), getter_Copies(msg));
+    nsresult rv = mComposeBundle->GetStringFromName(u"errorFilteringMsg", getter_Copies(msg));
     if (NS_SUCCEEDED(rv))
     {
       nsCOMPtr<nsIPrompt> prompt;
@@ -4334,7 +4334,7 @@ nsMsgComposeAndSend::MimeDoFCC(nsIFile          *input_file,
     goto FAIL;
 
   // Tell the user we are copying the message...
-  mComposeBundle->GetStringFromName(MOZ_UTF16("copyMessageStart"),
+  mComposeBundle->GetStringFromName(u"copyMessageStart",
                                     getter_Copies(msg));
   if (!msg.IsEmpty())
   {
diff --git a/mailnews/compose/src/nsMsgSendLater.cpp b/mailnews/compose/src/nsMsgSendLater.cpp
index 67e0553a4a..e610a044fd 100644
--- a/mailnews/compose/src/nsMsgSendLater.cpp
+++ b/mailnews/compose/src/nsMsgSendLater.cpp
@@ -249,7 +249,7 @@ nsMsgSendLater::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult s
       if (smtpUrl)
         smtpUrl->GetPrompt(getter_AddRefs(promptObject));
     }
-    nsMsgDisplayMessageByName(promptObject, MOZ_UTF16("errorQueuedDeliveryFailed"));
+    nsMsgDisplayMessageByName(promptObject, u"errorQueuedDeliveryFailed");
 
     // Getting the data failed, but we will still keep trying to send the rest...
     rv = StartNextMailFileSend(status);
diff --git a/mailnews/compose/src/nsMsgSendReport.cpp b/mailnews/compose/src/nsMsgSendReport.cpp
index 83f6e449c1..8ce5556268 100644
--- a/mailnews/compose/src/nsMsgSendReport.cpp
+++ b/mailnews/compose/src/nsMsgSendReport.cpp
@@ -302,36 +302,36 @@ NS_IMETHODIMP nsMsgSendReport::DisplayReport(nsIPrompt *prompt, bool showErrorOn
       return NS_OK;
     }
 
-    bundle->GetStringFromName(MOZ_UTF16("sendMessageErrorTitle"),
+    bundle->GetStringFromName(u"sendMessageErrorTitle",
                               getter_Copies(dialogTitle));
 
-    const char16_t* preStrName = MOZ_UTF16("sendFailed");
+    const char16_t* preStrName = u"sendFailed";
     bool askToGoBackToCompose = false;
     switch (mCurrentProcess)
     {
       case process_BuildMessage :
-        preStrName = MOZ_UTF16("sendFailed");
+        preStrName = u"sendFailed";
         askToGoBackToCompose = false;
         break;
       case process_NNTP :
-        preStrName = MOZ_UTF16("sendFailed");
+        preStrName = u"sendFailed";
         askToGoBackToCompose = false;
         break;
       case process_SMTP :
         bool nntpProceeded;
         mProcessReport[process_NNTP]->GetProceeded(&nntpProceeded);
         if (nntpProceeded)
-          preStrName = MOZ_UTF16("sendFailedButNntpOk");
+          preStrName = u"sendFailedButNntpOk";
         else
-          preStrName = MOZ_UTF16("sendFailed");
+          preStrName = u"sendFailed";
         askToGoBackToCompose = false;
         break;
       case process_Copy:
-        preStrName = MOZ_UTF16("failedCopyOperation");
+        preStrName = u"failedCopyOperation";
         askToGoBackToCompose = (mDeliveryMode == nsIMsgCompDeliverMode::Now);
         break;
       case process_FCC:
-        preStrName = MOZ_UTF16("failedCopyOperation");
+        preStrName = u"failedCopyOperation";
         askToGoBackToCompose = (mDeliveryMode == nsIMsgCompDeliverMode::Now);
         break;
     }
@@ -341,7 +341,7 @@ NS_IMETHODIMP nsMsgSendReport::DisplayReport(nsIPrompt *prompt, bool showErrorOn
     if (!askToGoBackToCompose && currMessage.IsEmpty())
     {
       //we don't have an error description but we can put a generic explanation
-      bundle->GetStringFromName(MOZ_UTF16("genericFailureExplanation"),
+      bundle->GetStringFromName(u"genericFailureExplanation",
                                 getter_Copies(currMessage));
     }
 
@@ -360,7 +360,7 @@ NS_IMETHODIMP nsMsgSendReport::DisplayReport(nsIPrompt *prompt, bool showErrorOn
     {
       bool oopsGiveMeBackTheComposeWindow = true;
       nsString text1;
-      bundle->GetStringFromName(MOZ_UTF16("returnToComposeWindowQuestion"),
+      bundle->GetStringFromName(u"returnToComposeWindowQuestion",
                                 getter_Copies(text1));
       if (!dialogMessage.IsEmpty())
         dialogMessage.AppendLiteral("\n");
@@ -380,25 +380,25 @@ NS_IMETHODIMP nsMsgSendReport::DisplayReport(nsIPrompt *prompt, bool showErrorOn
     switch (mDeliveryMode)
     {
       case nsIMsgCompDeliverMode::Later:
-        title = MOZ_UTF16("sendLaterErrorTitle");
-        messageName = MOZ_UTF16("unableToSendLater");
+        title = u"sendLaterErrorTitle";
+        messageName = u"unableToSendLater";
         break;
 
       case nsIMsgCompDeliverMode::AutoSaveAsDraft:
       case nsIMsgCompDeliverMode::SaveAsDraft:
-        title = MOZ_UTF16("saveDraftErrorTitle");
-        messageName = MOZ_UTF16("unableToSaveDraft");
+        title = u"saveDraftErrorTitle";
+        messageName = u"unableToSaveDraft";
         break;
 
       case nsIMsgCompDeliverMode::SaveAsTemplate:
-        title = MOZ_UTF16("saveTemplateErrorTitle");
-        messageName = MOZ_UTF16("unableToSaveTemplate");
+        title = u"saveTemplateErrorTitle";
+        messageName = u"unableToSaveTemplate";
         break;
 
       default:
         /* This should never happen! */
-        title = MOZ_UTF16("sendMessageErrorTitle");
-        messageName = MOZ_UTF16("sendFailed");
+        title = u"sendMessageErrorTitle";
+        messageName = u"sendFailed";
         break;
     }
 
@@ -410,7 +410,7 @@ NS_IMETHODIMP nsMsgSendReport::DisplayReport(nsIPrompt *prompt, bool showErrorOn
     if (currMessage.IsEmpty())
     {
       //we don't have an error description but we can put a generic explanation
-      bundle->GetStringFromName(MOZ_UTF16("genericFailureExplanation"),
+      bundle->GetStringFromName(u"genericFailureExplanation",
                                 getter_Copies(currMessage));
     }
 
diff --git a/mailnews/compose/src/nsSmtpProtocol.cpp b/mailnews/compose/src/nsSmtpProtocol.cpp
index e042715092..0983a15af9 100644
--- a/mailnews/compose/src/nsSmtpProtocol.cpp
+++ b/mailnews/compose/src/nsSmtpProtocol.cpp
@@ -96,7 +96,7 @@ nsresult nsExplainErrorDetails(nsISmtpUrl * aSmtpUrl, nsresult aCode, ...)
   switch (aCode)
   {
     case NS_ERROR_ILLEGAL_LOCALPART:
-      bundle->GetStringFromName(MOZ_UTF16("errorIllegalLocalPart"),
+      bundle->GetStringFromName(u"errorIllegalLocalPart",
                                 getter_Copies(eMsg));
       msg = nsTextFormatter::vsmprintf(eMsg.get(), args);
       break;
@@ -116,7 +116,7 @@ nsresult nsExplainErrorDetails(nsISmtpUrl * aSmtpUrl, nsresult aCode, ...)
       break;
     default:
       NS_WARNING("falling to default error code");
-      bundle->GetStringFromName(MOZ_UTF16("communicationsError"), getter_Copies(eMsg));
+      bundle->GetStringFromName(u"communicationsError", getter_Copies(eMsg));
       msg = nsTextFormatter::smprintf(eMsg.get(), aCode);
       break;
   }
@@ -1711,7 +1711,7 @@ nsresult nsSmtpProtocol::SendDataResponse()
   m_nextState = SMTP_SEND_POST_DATA;
   ClearFlag(SMTP_PAUSE_FOR_READ);   /* send data directly */
 
-  UpdateStatus(MOZ_UTF16("smtpDeliveringMail"));
+  UpdateStatus(u"smtpDeliveringMail");
 
   {
 //      m_runningURL->GetBodySize(&m_totalMessageSize);
@@ -1734,7 +1734,7 @@ void nsSmtpProtocol::SendMessageInFile()
   // for now, we are always done at this point..we aren't making multiple calls
   // to post data...
 
-  UpdateStatus(MOZ_UTF16("smtpDeliveringMail"));
+  UpdateStatus(u"smtpDeliveringMail");
   m_nextState = SMTP_RESPONSE;
   m_nextStateAfterResponse = SMTP_SEND_MESSAGE_RESPONSE;
 }
@@ -1779,7 +1779,7 @@ nsresult nsSmtpProtocol::SendMessageResponse()
     return(NS_ERROR_SENDING_MESSAGE);
   }
 
-  UpdateStatus(MOZ_UTF16("smtpMailSent"));
+  UpdateStatus(u"smtpMailSent");
 
   /* else */
   return SendQuit();
@@ -2167,11 +2167,11 @@ nsSmtpProtocol::PromptForPassword(nsISmtpServer *aSmtpServer, nsISmtpUrl *aSmtpU
   nsString passwordPromptString;
   if(formatStrings[1])
     rv = composeStringBundle->FormatStringFromName(
-      MOZ_UTF16("smtpEnterPasswordPromptWithUsername"),
+      u"smtpEnterPasswordPromptWithUsername",
       formatStrings, 2, getter_Copies(passwordPromptString));
   else
     rv = composeStringBundle->FormatStringFromName(
-      MOZ_UTF16("smtpEnterPasswordPrompt"),
+      u"smtpEnterPasswordPrompt",
       formatStrings, 1, getter_Copies(passwordPromptString));
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -2181,7 +2181,7 @@ nsSmtpProtocol::PromptForPassword(nsISmtpServer *aSmtpServer, nsISmtpUrl *aSmtpU
 
   nsString passwordTitle;
   rv = composeStringBundle->GetStringFromName(
-    MOZ_UTF16("smtpEnterPasswordPromptTitle"),
+    u"smtpEnterPasswordPromptTitle",
     getter_Copies(passwordTitle));
   NS_ENSURE_SUCCESS(rv,rv);
 
diff --git a/mailnews/extensions/mailviews/src/nsMsgMailViewList.cpp b/mailnews/extensions/mailviews/src/nsMsgMailViewList.cpp
index b1d67bd5d6..4104ea5187 100644
--- a/mailnews/extensions/mailviews/src/nsMsgMailViewList.cpp
+++ b/mailnews/extensions/mailviews/src/nsMsgMailViewList.cpp
@@ -71,15 +71,15 @@ NS_IMETHODIMP nsMsgMailView::GetPrettyName(char16_t ** aMailViewName)
     // see if mName has an associated pretty name inside our string bundle and if so, use that as the pretty name
     // otherwise just return mName
     if (mName.EqualsLiteral(kDefaultViewPeopleIKnow))
-        rv = mBundle->GetStringFromName(MOZ_UTF16("mailViewPeopleIKnow"), aMailViewName);
+        rv = mBundle->GetStringFromName(u"mailViewPeopleIKnow", aMailViewName);
     else if (mName.EqualsLiteral(kDefaultViewRecent))
-        rv = mBundle->GetStringFromName(MOZ_UTF16("mailViewRecentMail"), aMailViewName);
+        rv = mBundle->GetStringFromName(u"mailViewRecentMail", aMailViewName);
     else if (mName.EqualsLiteral(kDefaultViewFiveDays))
-        rv = mBundle->GetStringFromName(MOZ_UTF16("mailViewLastFiveDays"), aMailViewName);
+        rv = mBundle->GetStringFromName(u"mailViewLastFiveDays", aMailViewName);
     else if (mName.EqualsLiteral(kDefaultViewNotJunk))
-        rv = mBundle->GetStringFromName(MOZ_UTF16("mailViewNotJunk"), aMailViewName);
+        rv = mBundle->GetStringFromName(u"mailViewNotJunk", aMailViewName);
     else if (mName.EqualsLiteral(kDefaultViewHasAttachments))
-        rv = mBundle->GetStringFromName(MOZ_UTF16("mailViewHasAttachments"), aMailViewName);
+        rv = mBundle->GetStringFromName(u"mailViewHasAttachments", aMailViewName);
     else
         *aMailViewName = ToNewUnicode(mName);
 
diff --git a/mailnews/extensions/mdn/src/nsMsgMdnGenerator.cpp b/mailnews/extensions/mdn/src/nsMsgMdnGenerator.cpp
index bcb841116b..c9b9cbbe58 100644
--- a/mailnews/extensions/mdn/src/nsMsgMdnGenerator.cpp
+++ b/mailnews/extensions/mdn/src/nsMsgMdnGenerator.cpp
@@ -471,7 +471,7 @@ nsresult nsMsgMdnGenerator::CreateFirstPart()
 
     parm = PR_smprintf("From: %s" CRLF, convbuf ? convbuf : m_email.get());
 
-    rv = FormatStringFromName(MOZ_UTF16("MsgMdnMsgSentTo"), NS_ConvertASCIItoUTF16(m_email).get(),
+    rv = FormatStringFromName(u"MsgMdnMsgSentTo", NS_ConvertASCIItoUTF16(m_email).get(),
                             getter_Copies(firstPart1));
     if (NS_FAILED(rv))
         return rv;
@@ -493,32 +493,32 @@ nsresult nsMsgMdnGenerator::CreateFirstPart()
     {
     case nsIMsgMdnGenerator::eDisplayed:
         rv = GetStringFromName(
-            MOZ_UTF16("MdnDisplayedReceipt"),
+            u"MdnDisplayedReceipt",
             getter_Copies(receipt_string));
         break;
     case nsIMsgMdnGenerator::eDispatched:
         rv = GetStringFromName(
-            MOZ_UTF16("MdnDispatchedReceipt"),
+            u"MdnDispatchedReceipt",
             getter_Copies(receipt_string));
         break;
     case nsIMsgMdnGenerator::eProcessed:
         rv = GetStringFromName(
-            MOZ_UTF16("MdnProcessedReceipt"),
+            u"MdnProcessedReceipt",
             getter_Copies(receipt_string));
         break;
     case nsIMsgMdnGenerator::eDeleted:
         rv = GetStringFromName(
-            MOZ_UTF16("MdnDeletedReceipt"),
+            u"MdnDeletedReceipt",
             getter_Copies(receipt_string));
         break;
     case nsIMsgMdnGenerator::eDenied:
         rv = GetStringFromName(
-            MOZ_UTF16("MdnDeniedReceipt"),
+            u"MdnDeniedReceipt",
             getter_Copies(receipt_string));
         break;
     case nsIMsgMdnGenerator::eFailed:
         rv = GetStringFromName(
-            MOZ_UTF16("MdnFailedReceipt"),
+            u"MdnFailedReceipt",
             getter_Copies(receipt_string));
         break;
     default:
@@ -594,32 +594,32 @@ report-type=disposition-notification;\r\n\tboundary=\"%s\"" CRLF CRLF,
     {
     case nsIMsgMdnGenerator::eDisplayed:
         rv = GetStringFromName(
-            MOZ_UTF16("MsgMdnDisplayed"),
+            u"MsgMdnDisplayed",
             getter_Copies(firstPart2));
         break;
     case nsIMsgMdnGenerator::eDispatched:
         rv = GetStringFromName(
-            MOZ_UTF16("MsgMdnDispatched"),
+            u"MsgMdnDispatched",
             getter_Copies(firstPart2));
         break;
     case nsIMsgMdnGenerator::eProcessed:
         rv = GetStringFromName(
-            MOZ_UTF16("MsgMdnProcessed"),
+            u"MsgMdnProcessed",
             getter_Copies(firstPart2));
         break;
     case nsIMsgMdnGenerator::eDeleted:
         rv = GetStringFromName(
-            MOZ_UTF16("MsgMdnDeleted"),
+            u"MsgMdnDeleted",
             getter_Copies(firstPart2));
         break;
     case nsIMsgMdnGenerator::eDenied:
         rv = GetStringFromName(
-            MOZ_UTF16("MsgMdnDenied"),
+            u"MsgMdnDenied",
             getter_Copies(firstPart2));
         break;
     case nsIMsgMdnGenerator::eFailed:
         rv = GetStringFromName(
-            MOZ_UTF16("MsgMdnFailed"),
+            u"MsgMdnFailed",
             getter_Copies(firstPart2));
         break;
     default:
@@ -1082,19 +1082,19 @@ NS_IMETHODIMP nsMsgMdnGenerator::OnStopRunningUrl(nsIURI *url,
     {
       case NS_ERROR_UNKNOWN_HOST:
       case NS_ERROR_UNKNOWN_PROXY_HOST:
-        exitString = MOZ_UTF16("smtpSendFailedUnknownServer");
+        exitString = u"smtpSendFailedUnknownServer";
         break;
       case NS_ERROR_CONNECTION_REFUSED:
       case NS_ERROR_PROXY_CONNECTION_REFUSED:
-        exitString = MOZ_UTF16("smtpSendRequestRefused");
+        exitString = u"smtpSendRequestRefused";
         break;
       case NS_ERROR_NET_INTERRUPT:
       case NS_ERROR_ABORT: // we have no proper string for error code NS_ERROR_ABORT in compose bundle
-        exitString = MOZ_UTF16("smtpSendInterrupted");
+        exitString = u"smtpSendInterrupted";
         break;
       case NS_ERROR_NET_TIMEOUT:
       case NS_ERROR_NET_RESET:
-        exitString = MOZ_UTF16("smtpSendTimeout");
+        exitString = u"smtpSendTimeout";
         break;
       default:
         exitString = errorStringNameForErrorCode(aExitCode);
@@ -1128,7 +1128,7 @@ NS_IMETHODIMP nsMsgMdnGenerator::OnStopRunningUrl(nsIURI *url,
     nsString failed_msg, dialogTitle;
 
     bundle->FormatStringFromName(exitString, params, 1, getter_Copies(failed_msg));
-    bundle->GetStringFromName(MOZ_UTF16("sendMessageErrorTitle"), getter_Copies(dialogTitle));
+    bundle->GetStringFromName(u"sendMessageErrorTitle", getter_Copies(dialogTitle));
 
     nsCOMPtr<nsIPrompt> dialog;
     rv = m_window->GetPromptDialog(getter_AddRefs(dialog));
diff --git a/mailnews/extensions/smime/src/nsMsgComposeSecure.cpp b/mailnews/extensions/smime/src/nsMsgComposeSecure.cpp
index c8e07fb438..57af8c1972 100644
--- a/mailnews/extensions/smime/src/nsMsgComposeSecure.cpp
+++ b/mailnews/extensions/smime/src/nsMsgComposeSecure.cpp
@@ -561,7 +561,7 @@ nsresult nsMsgComposeSecure::MimeInitEncryption(bool aSign, nsIMsgSendReport *se
   if (!sMIMEBundle)
     return NS_ERROR_FAILURE;
 
-  sMIMEBundle->GetStringFromName(MOZ_UTF16("mime_smimeEncryptedContentDesc"),
+  sMIMEBundle->GetStringFromName(u"mime_smimeEncryptedContentDesc",
                                  getter_Copies(mime_smime_enc_content_desc));
   NS_ConvertUTF16toUTF8 enc_content_desc_utf8(mime_smime_enc_content_desc);
 
@@ -621,7 +621,7 @@ nsresult nsMsgComposeSecure::MimeInitEncryption(bool aSign, nsIMsgSendReport *se
   if (NS_FAILED(rv)) return rv;
   rv = mEncryptionCinfo->CreateEncrypted(mCerts);
   if (NS_FAILED(rv)) {
-    SetError(sendReport, MOZ_UTF16("ErrorEncryptMail"));
+    SetError(sendReport, u"ErrorEncryptMail");
     goto FAIL;
   }
 
@@ -638,7 +638,7 @@ nsresult nsMsgComposeSecure::MimeInitEncryption(bool aSign, nsIMsgSendReport *se
 
   rv = mEncryptionContext->Start(mEncryptionCinfo, mime_crypto_write_base64, mCryptoEncoder);
   if (NS_FAILED(rv)) {
-    SetError(sendReport, MOZ_UTF16("ErrorEncryptMail"));
+    SetError(sendReport, u"ErrorEncryptMail");
     goto FAIL;
   }
 
@@ -677,7 +677,7 @@ nsresult nsMsgComposeSecure::MimeFinishMultipartSigned (bool aOuter, nsIMsgSendR
   if (!sMIMEBundle)
     return NS_ERROR_FAILURE;
 
-  sMIMEBundle->GetStringFromName(MOZ_UTF16("mime_smimeSignatureContentDesc"),
+  sMIMEBundle->GetStringFromName(u"mime_smimeSignatureContentDesc",
                                  getter_Copies(mime_smime_sig_content_desc));
 
   NS_ConvertUTF16toUTF8 sig_content_desc_utf8(mime_smime_sig_content_desc);
@@ -741,7 +741,7 @@ nsresult nsMsgComposeSecure::MimeFinishMultipartSigned (bool aOuter, nsIMsgSendR
   rv = cinfo->CreateSigned(mSelfSigningCert, mSelfEncryptionCert,
     (unsigned char*)hashString.get(), hashString.Length(), mHashType);
   if (NS_FAILED(rv))  {
-    SetError(sendReport, MOZ_UTF16("ErrorCanNotSignMail"));
+    SetError(sendReport, u"ErrorCanNotSignMail");
     goto FAIL;
   }
 
@@ -755,14 +755,14 @@ nsresult nsMsgComposeSecure::MimeFinishMultipartSigned (bool aOuter, nsIMsgSendR
   PR_SetError(0,0);
   rv = encoder->Start(cinfo, mime_crypto_write_base64, mSigEncoder);
   if (NS_FAILED(rv)) {
-    SetError(sendReport, MOZ_UTF16("ErrorCanNotSignMail"));
+    SetError(sendReport, u"ErrorCanNotSignMail");
     goto FAIL;
   }
 
   // We're not passing in any data, so no update needed.
   rv = encoder->Finish();
   if (NS_FAILED(rv)) {
-    SetError(sendReport, MOZ_UTF16("ErrorCanNotSignMail"));
+    SetError(sendReport, u"ErrorCanNotSignMail");
     goto FAIL;
   }
 
@@ -836,7 +836,7 @@ nsresult nsMsgComposeSecure::MimeFinishEncryption (bool aSign, nsIMsgSendReport
 
   rv = mEncryptionContext->Finish();
   if (NS_FAILED(rv)) {
-    SetError(sendReport, MOZ_UTF16("ErrorEncryptMail"));
+    SetError(sendReport, u"ErrorEncryptMail");
     goto FAIL;
   }
 
@@ -943,12 +943,12 @@ nsresult nsMsgComposeSecure::MimeCryptoHackCerts(const char *aRecipients,
 
   // must have both the signing and encryption certs to sign
   if (!mSelfSigningCert && aSign) {
-    SetError(sendReport, MOZ_UTF16("NoSenderSigningCert"));
+    SetError(sendReport, u"NoSenderSigningCert");
     return NS_ERROR_FAILURE;
   }
 
   if (!mSelfEncryptionCert && aEncrypt) {
-    SetError(sendReport, MOZ_UTF16("NoSenderEncryptionCert"));
+    SetError(sendReport, u"NoSenderEncryptionCert");
     return NS_ERROR_FAILURE;
   }
 
@@ -985,7 +985,7 @@ nsresult nsMsgComposeSecure::MimeCryptoHackCerts(const char *aRecipients,
         // Failure to find a valid encryption cert is fatal.
         // Here I assume that mailbox is ascii rather than utf8.
         SetErrorWithParam(sendReport,
-                          MOZ_UTF16("MissingRecipientEncryptionCert"),
+                          u"MissingRecipientEncryptionCert",
                           mailboxes[i].get());
 
         return res;
diff --git a/mailnews/imap/src/nsImapIncomingServer.cpp b/mailnews/imap/src/nsImapIncomingServer.cpp
index 2e25b6249e..23e974add8 100644
--- a/mailnews/imap/src/nsImapIncomingServer.cpp
+++ b/mailnews/imap/src/nsImapIncomingServer.cpp
@@ -1857,7 +1857,7 @@ nsImapIncomingServer::FEAlert(const nsAString& aAlertString,
       const char16_t *params[] = { hostName.get(), tempString.get() };
 
       rv = m_stringBundle->FormatStringFromName(
-        MOZ_UTF16("imapServerAlert"),
+        u"imapServerAlert",
         params, 2, getter_Copies(message));
       if (NS_SUCCEEDED(rv))
         return AlertUser(message, aUrl);
@@ -2198,7 +2198,7 @@ nsImapIncomingServer::PromptPassword(nsIMsgWindow *aMsgWindow,
 
   nsString passwordText;
   rv = m_stringBundle->FormatStringFromName(
-    MOZ_UTF16("imapEnterServerPasswordPrompt"),
+    u"imapEnterServerPasswordPrompt",
     formatStrings, 2, getter_Copies(passwordText));
   NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/mailnews/imap/src/nsImapMailFolder.cpp b/mailnews/imap/src/nsImapMailFolder.cpp
index 6d770d0fd9..d4996d8dc8 100644
--- a/mailnews/imap/src/nsImapMailFolder.cpp
+++ b/mailnews/imap/src/nsImapMailFolder.cpp
@@ -1614,7 +1614,7 @@ NS_IMETHODIMP nsImapMailFolder::Rename (const nsAString& newName, nsIMsgWindow *
         };
         nsString alertString;
         rv = bundle->FormatStringFromName(
-          MOZ_UTF16("imapSpecialChar"),
+          u"imapSpecialChar",
           formatStrings, 1, getter_Copies(alertString));
         nsCOMPtr<nsIPrompt> dialog(do_GetInterface(docShell));
         // setting up the dialog title
@@ -1627,7 +1627,7 @@ NS_IMETHODIMP nsImapMailFolder::Rename (const nsAString& newName, nsIMsgWindow *
         NS_ENSURE_SUCCESS(rv, rv);
         const char16_t *titleParams[] = { accountName.get() };
         rv = bundle->FormatStringFromName(
-          MOZ_UTF16("imapAlertDialogTitle"),
+          u"imapAlertDialogTitle",
           titleParams, 1, getter_Copies(dialogTitle));
 
         if (dialog && !alertString.IsEmpty())
@@ -2434,20 +2434,20 @@ nsImapMailFolder::DeleteSubFolders(nsIArray* folders, nsIMsgWindow *msgWindow)
 
     nsAutoString deleteFolderDialogTitle;
     rv = bundle->GetStringFromName(
-      MOZ_UTF16("imapDeleteFolderDialogTitle"),
+      u"imapDeleteFolderDialogTitle",
       getter_Copies(deleteFolderDialogTitle));
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsAutoString deleteFolderButtonLabel;
     rv = bundle->GetStringFromName(
-      MOZ_UTF16("imapDeleteFolderButtonLabel"),
+      u"imapDeleteFolderButtonLabel",
       getter_Copies(deleteFolderButtonLabel));
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsAutoString confirmationStr;
     rv = bundle->FormatStringFromName((deleteNoTrash) ?
-        MOZ_UTF16("imapDeleteNoTrash") :
-        MOZ_UTF16("imapMoveFolderToTrash"),
+        u"imapDeleteNoTrash" :
+        u"imapMoveFolderToTrash",
       formatStrings, 1, getter_Copies(confirmationStr));
     NS_ENSURE_SUCCESS(rv, rv);
     if (!msgWindow)
@@ -6068,7 +6068,7 @@ nsImapMailFolder::FillInFolderProps(nsIMsgImapFolderProps *aFolderProps)
     }
     const char16_t *params[] = { uniOwner.get() };
     rv = bundle->FormatStringFromName(
-      MOZ_UTF16("imapOtherUsersFolderTypeDescription"),
+      u"imapOtherUsersFolderTypeDescription",
       params, 1, getter_Copies(folderTypeDesc));
   }
   else if (GetFolderACL()->GetIsFolderShared())
@@ -6599,7 +6599,7 @@ nsresult nsMsgIMAPFolderACL::CreateACLRightsString(nsAString& aRightsString)
 
   if (GetDoIHaveFullRightsForFolder()) {
     nsAutoString result;
-    rv = bundle->GetStringFromName(MOZ_UTF16("imapAclFullRights"),
+    rv = bundle->GetStringFromName(u"imapAclFullRights",
                                    getter_Copies(result));
     aRightsString.Assign(result);
     return rv;
@@ -6608,42 +6608,42 @@ nsresult nsMsgIMAPFolderACL::CreateACLRightsString(nsAString& aRightsString)
   {
     if (GetCanIReadFolder())
     {
-      bundle->GetStringFromName(MOZ_UTF16("imapAclReadRight"),
+      bundle->GetStringFromName(u"imapAclReadRight",
                                 getter_Copies(curRight));
       aRightsString.Append(curRight);
     }
     if (GetCanIWriteFolder())
     {
       if (!aRightsString.IsEmpty()) aRightsString.AppendLiteral(", ");
-      bundle->GetStringFromName(MOZ_UTF16("imapAclWriteRight"),
+      bundle->GetStringFromName(u"imapAclWriteRight",
                                 getter_Copies(curRight));
       aRightsString.Append(curRight);
     }
     if (GetCanIInsertInFolder())
     {
       if (!aRightsString.IsEmpty()) aRightsString.AppendLiteral(", ");
-      bundle->GetStringFromName(MOZ_UTF16("imapAclInsertRight"),
+      bundle->GetStringFromName(u"imapAclInsertRight",
                                 getter_Copies(curRight));
       aRightsString.Append(curRight);
     }
     if (GetCanILookupFolder())
     {
       if (!aRightsString.IsEmpty()) aRightsString.AppendLiteral(", ");
-      bundle->GetStringFromName(MOZ_UTF16("imapAclLookupRight"),
+      bundle->GetStringFromName(u"imapAclLookupRight",
                                 getter_Copies(curRight));
       aRightsString.Append(curRight);
     }
     if (GetCanIStoreSeenInFolder())
     {
       if (!aRightsString.IsEmpty()) aRightsString.AppendLiteral(", ");
-      bundle->GetStringFromName(MOZ_UTF16("imapAclSeenRight"),
+      bundle->GetStringFromName(u"imapAclSeenRight",
                                 getter_Copies(curRight));
       aRightsString.Append(curRight);
     }
     if (GetCanIDeleteInFolder())
     {
       if (!aRightsString.IsEmpty()) aRightsString.AppendLiteral(", ");
-      bundle->GetStringFromName(MOZ_UTF16("imapAclDeleteRight"),
+      bundle->GetStringFromName(u"imapAclDeleteRight",
                                 getter_Copies(curRight));
       aRightsString.Append(curRight);
     }
@@ -6651,28 +6651,28 @@ nsresult nsMsgIMAPFolderACL::CreateACLRightsString(nsAString& aRightsString)
     {
       if (!aRightsString.IsEmpty())
         aRightsString.AppendLiteral(", ");
-      bundle->GetStringFromName(MOZ_UTF16("imapAclExpungeRight"),
+      bundle->GetStringFromName(u"imapAclExpungeRight",
                                 getter_Copies(curRight));
       aRightsString.Append(curRight);
     }
     if (GetCanICreateSubfolder())
     {
       if (!aRightsString.IsEmpty()) aRightsString.AppendLiteral(", ");
-      bundle->GetStringFromName(MOZ_UTF16("imapAclCreateRight"),
+      bundle->GetStringFromName(u"imapAclCreateRight",
                                 getter_Copies(curRight));
       aRightsString.Append(curRight);
     }
     if (GetCanIPostToFolder())
     {
       if (!aRightsString.IsEmpty()) aRightsString.AppendLiteral(", ");
-      bundle->GetStringFromName(MOZ_UTF16("imapAclPostRight"),
+      bundle->GetStringFromName(u"imapAclPostRight",
                                 getter_Copies(curRight));
       aRightsString.Append(curRight);
     }
     if (GetCanIAdministerFolder())
     {
       if (!aRightsString.IsEmpty()) aRightsString.AppendLiteral(", ");
-      bundle->GetStringFromName(MOZ_UTF16("imapAclAdministerRight"),
+      bundle->GetStringFromName(u"imapAclAdministerRight",
                                 getter_Copies(curRight));
       aRightsString.Append(curRight);
     }
@@ -8217,7 +8217,7 @@ nsImapMailFolder::CopyStreamMessage(nsIMsgDBHdr* message,
       rv = IMAPGetStringBundle(getter_AddRefs(bundle));
       NS_ENSURE_SUCCESS(rv, rv);
       rv = bundle->FormatStringFromName(
-        MOZ_UTF16("imapCopyingMessageOf2"),
+        u"imapCopyingMessageOf2",
         formatStrings, 3, getter_Copies(progressText));
       nsCOMPtr <nsIMsgStatusFeedback> statusFeedback;
       if (m_copyState->m_msgWindow)
diff --git a/mailnews/imap/src/nsImapProtocol.cpp b/mailnews/imap/src/nsImapProtocol.cpp
index f89cab537b..02a56db51c 100644
--- a/mailnews/imap/src/nsImapProtocol.cpp
+++ b/mailnews/imap/src/nsImapProtocol.cpp
@@ -551,7 +551,7 @@ nsImapProtocol::Initialize(nsIImapHostSessionList * aHostSessionList,
   rv = IMAPGetStringBundle(getter_AddRefs(bundle));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = bundle->GetStringFromName(MOZ_UTF16("imapEmptyMimePart"),
+  rv = bundle->GetStringFromName(u"imapEmptyMimePart",
     getter_Copies(m_emptyMimePartString));
   NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/mailnews/imap/src/nsImapService.cpp b/mailnews/imap/src/nsImapService.cpp
index e0812eb371..55cc422b2d 100644
--- a/mailnews/imap/src/nsImapService.cpp
+++ b/mailnews/imap/src/nsImapService.cpp
@@ -2753,7 +2753,7 @@ NS_IMETHODIMP nsImapService::NewChannel2(nsIURI *aURI,
       const char16_t *formatStrings[1] = { unescapedName.get() };
 
       rv = bundle->FormatStringFromName(
-        MOZ_UTF16("imapSubscribePrompt"),
+        u"imapSubscribePrompt",
         formatStrings, 1, getter_Copies(confirmText));
       NS_ENSURE_SUCCESS(rv,rv);
 
diff --git a/mailnews/import/applemail/src/nsAppleMailImport.cpp b/mailnews/import/applemail/src/nsAppleMailImport.cpp
index a4d3a73c78..3097b7df5e 100644
--- a/mailnews/import/applemail/src/nsAppleMailImport.cpp
+++ b/mailnews/import/applemail/src/nsAppleMailImport.cpp
@@ -63,13 +63,13 @@ NS_IMPL_ISUPPORTS(nsAppleMailImportModule, nsIImportModule)
 NS_IMETHODIMP nsAppleMailImportModule::GetName(char16_t **aName)
 {
   return mBundle ?
-    mBundle->GetStringFromName(MOZ_UTF16("ApplemailImportName"), aName) : NS_ERROR_FAILURE;
+    mBundle->GetStringFromName(u"ApplemailImportName", aName) : NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP nsAppleMailImportModule::GetDescription(char16_t **aName)
 {
   return mBundle ?
-    mBundle->GetStringFromName(MOZ_UTF16("ApplemailImportDescription"), aName) : NS_ERROR_FAILURE;
+    mBundle->GetStringFromName(u"ApplemailImportDescription", aName) : NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP nsAppleMailImportModule::GetSupports(char **aSupports)
@@ -102,7 +102,7 @@ NS_IMETHODIMP nsAppleMailImportModule::GetImportInterface(const char *aImportTyp
         rv = impSvc->CreateNewGenericMail(getter_AddRefs(generic));
         if (NS_SUCCEEDED(rv)) {
           nsAutoString name;
-          rv = mBundle->GetStringFromName(MOZ_UTF16("ApplemailImportName"), getter_Copies(name));
+          rv = mBundle->GetStringFromName(u"ApplemailImportName", getter_Copies(name));
           NS_ENSURE_SUCCESS(rv, rv);
 
           nsCOMPtr<nsISupportsString> nameString(do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID, &rv));
@@ -475,7 +475,7 @@ nsAppleMailImportMail::ImportMailbox(nsIImportMailboxDescriptor *aMailbox,
   nsCOMPtr<nsIFile> mboxFolder;
   nsresult rv = aMailbox->GetFile(getter_AddRefs(mboxFolder));
   if (NS_FAILED(rv) || !mboxFolder) {
-    ReportStatus(MOZ_UTF16("ApplemailImportMailboxConverterror"), mailboxName, errorLog);
+    ReportStatus(u"ApplemailImportMailboxConverterror", mailboxName, errorLog);
     SetLogs(successLog, errorLog, aSuccessLog, aErrorLog);
     return NS_ERROR_FAILURE;
   }
@@ -501,7 +501,7 @@ nsAppleMailImportMail::ImportMailbox(nsIImportMailboxDescriptor *aMailbox,
       mProgress = finalSize;
 
       // report that we successfully imported this mailbox
-      ReportStatus(MOZ_UTF16("ApplemailImportMailboxSuccess"), mailboxName, successLog);
+      ReportStatus(u"ApplemailImportMailboxSuccess", mailboxName, successLog);
       SetLogs(successLog, errorLog, aSuccessLog, aErrorLog);
       return NS_OK;
     }
@@ -510,7 +510,7 @@ nsAppleMailImportMail::ImportMailbox(nsIImportMailboxDescriptor *aMailbox,
     nsCOMPtr<nsISimpleEnumerator> directoryEnumerator;
     rv = messagesFolder->GetDirectoryEntries(getter_AddRefs(directoryEnumerator));
     if (NS_FAILED(rv)) {
-      ReportStatus(MOZ_UTF16("ApplemailImportMailboxConvertError"), mailboxName, errorLog);
+      ReportStatus(u"ApplemailImportMailboxConvertError", mailboxName, errorLog);
       SetLogs(successLog, errorLog, aSuccessLog, aErrorLog);
       return NS_ERROR_FAILURE;
     }
@@ -519,7 +519,7 @@ nsAppleMailImportMail::ImportMailbox(nsIImportMailboxDescriptor *aMailbox,
     nsCOMPtr<nsIMsgPluggableStore> msgStore;
     rv = aDstFolder->GetMsgStore(getter_AddRefs(msgStore));
     if (!msgStore || NS_FAILED(rv)) {
-      ReportStatus(MOZ_UTF16("ApplemailImportMailboxConverterror"), mailboxName, errorLog);
+      ReportStatus(u"ApplemailImportMailboxConverterror", mailboxName, errorLog);
       SetLogs(successLog, errorLog, aSuccessLog, aErrorLog);
       return NS_ERROR_FAILURE;
     }
@@ -581,7 +581,7 @@ nsAppleMailImportMail::ImportMailbox(nsIImportMailboxDescriptor *aMailbox,
   mProgress = finalSize;
 
   // report that we successfully imported this mailbox
-  ReportStatus(MOZ_UTF16("ApplemailImportMailboxSuccess"), mailboxName, successLog);
+  ReportStatus(u"ApplemailImportMailboxSuccess", mailboxName, successLog);
   SetLogs(successLog, errorLog, aSuccessLog, aErrorLog);
 
   return NS_OK;
diff --git a/mailnews/import/becky/src/nsBeckyAddressBooks.cpp b/mailnews/import/becky/src/nsBeckyAddressBooks.cpp
index 128b5e1236..86654ac0e0 100644
--- a/mailnews/import/becky/src/nsBeckyAddressBooks.cpp
+++ b/mailnews/import/becky/src/nsBeckyAddressBooks.cpp
@@ -61,7 +61,7 @@ nsBeckyAddressBooks::GetAutoFind(char16_t **aDescription,
   NS_ENSURE_ARG_POINTER(_retval);
 
   *aDescription =
-    nsBeckyStringBundle::GetStringByName(MOZ_UTF16("BeckyImportDescription"));
+    nsBeckyStringBundle::GetStringByName(u"BeckyImportDescription");
   *_retval = false;
 
   return NS_OK;
@@ -354,7 +354,7 @@ nsBeckyAddressBooks::ImportAddressBook(nsIImportABDescriptor *aSource,
   if (!error.IsEmpty())
     *aErrorLog = ToNewUnicode(error);
   else
-    *aSuccessLog = nsBeckyStringBundle::GetStringByName(MOZ_UTF16("BeckyImportAddressSuccess"));
+    *aSuccessLog = nsBeckyStringBundle::GetStringByName(u"BeckyImportAddressSuccess");
 
   return rv;
 }
diff --git a/mailnews/import/becky/src/nsBeckyFilters.cpp b/mailnews/import/becky/src/nsBeckyFilters.cpp
index 87900b08d3..517a18014d 100644
--- a/mailnews/import/becky/src/nsBeckyFilters.cpp
+++ b/mailnews/import/becky/src/nsBeckyFilters.cpp
@@ -100,7 +100,7 @@ nsBeckyFilters::AutoLocate(char16_t **aDescription,
 
   if (aDescription) {
     *aDescription =
-      nsBeckyStringBundle::GetStringByName(MOZ_UTF16("BeckyImportDescription"));
+      nsBeckyStringBundle::GetStringByName(u"BeckyImportDescription");
   }
   *aLocation = nullptr;
   *_retval = false;
diff --git a/mailnews/import/becky/src/nsBeckyImport.cpp b/mailnews/import/becky/src/nsBeckyImport.cpp
index 32a01b14d8..6d4a47b85f 100644
--- a/mailnews/import/becky/src/nsBeckyImport.cpp
+++ b/mailnews/import/becky/src/nsBeckyImport.cpp
@@ -52,7 +52,7 @@ nsBeckyImport::GetName(char16_t **aName)
 {
   NS_ENSURE_ARG_POINTER(aName);
   *aName =
-    nsBeckyStringBundle::GetStringByName(MOZ_UTF16("BeckyImportName"));
+    nsBeckyStringBundle::GetStringByName(u"BeckyImportName");
   return NS_OK;
 }
 
@@ -61,7 +61,7 @@ nsBeckyImport::GetDescription(char16_t **aDescription)
 {
   NS_ENSURE_ARG_POINTER(aDescription);
   *aDescription =
-    nsBeckyStringBundle::GetStringByName(MOZ_UTF16("BeckyImportDescription"));
+    nsBeckyStringBundle::GetStringByName(u"BeckyImportDescription");
   return NS_OK;
 }
 
@@ -97,7 +97,7 @@ nsBeckyImport::GetMailImportInterface(nsISupports **aInterface)
   generic->SetData("mailInterface", importer);
 
   nsString name;
-  name.Adopt(nsBeckyStringBundle::GetStringByName(MOZ_UTF16("BeckyImportName")));
+  name.Adopt(nsBeckyStringBundle::GetStringByName(u"BeckyImportName"));
 
   nsCOMPtr<nsISupportsString> nameString(do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID, &rv));
   NS_ENSURE_SUCCESS(rv, rv);
diff --git a/mailnews/import/becky/src/nsBeckyMail.cpp b/mailnews/import/becky/src/nsBeckyMail.cpp
index 76cf4a670a..329f2f63e6 100644
--- a/mailnews/import/becky/src/nsBeckyMail.cpp
+++ b/mailnews/import/becky/src/nsBeckyMail.cpp
@@ -614,7 +614,7 @@ nsBeckyMail::ImportMailbox(nsIImportMailboxDescriptor *aSource,
   nsAutoString successMessage;
   const char16_t *format = { name.get() };
   rv =
-      nsBeckyStringBundle::FormatStringFromName(MOZ_UTF16("BeckyImportMailboxSuccess"),
+      nsBeckyStringBundle::FormatStringFromName(u"BeckyImportMailboxSuccess",
                                                 &format,
                                                 1,
                                                 getter_Copies(successMessage));
diff --git a/mailnews/import/becky/src/nsBeckySettings.cpp b/mailnews/import/becky/src/nsBeckySettings.cpp
index 348b7fe68c..f9eff51621 100644
--- a/mailnews/import/becky/src/nsBeckySettings.cpp
+++ b/mailnews/import/becky/src/nsBeckySettings.cpp
@@ -55,7 +55,7 @@ nsBeckySettings::AutoLocate(char16_t **aDescription,
   NS_ENSURE_ARG_POINTER(_retval);
 
   *aDescription =
-    nsBeckyStringBundle::GetStringByName(MOZ_UTF16("BeckyImportName"));
+    nsBeckyStringBundle::GetStringByName(u"BeckyImportName");
   *aLocation = nullptr;
   *_retval = false;
 
diff --git a/mailnews/import/outlook/src/nsOutlookCompose.cpp b/mailnews/import/outlook/src/nsOutlookCompose.cpp
index c716c650f3..f33cfb305d 100644
--- a/mailnews/import/outlook/src/nsOutlookCompose.cpp
+++ b/mailnews/import/outlook/src/nsOutlookCompose.cpp
@@ -179,13 +179,13 @@ nsresult OutlookSendListener::CreateSendListener(nsIMsgSendListener **ppListener
 /////////////////////////////////////////////////////////////////////////////////
 
 #define hackBeginA "begin"
-#define hackBeginW MOZ_UTF16(hackBeginA)
+#define hackBeginW u"begin"
 #define hackEndA "\015\012end"
-#define hackEndW MOZ_UTF16(hackEndA)
+#define hackEndW u"\015\012end"
 #define hackCRLFA "crlf"
-#define hackCRLFW MOZ_UTF16(hackCRLFA)
+#define hackCRLFW u"crlf"
 #define hackAmpersandA "amp"
-#define hackAmpersandW MOZ_UTF16(hackAmpersandA)
+#define hackAmpersandW u"amp"
 
 nsOutlookCompose::nsOutlookCompose()
 {
diff --git a/mailnews/import/src/nsImportMail.cpp b/mailnews/import/src/nsImportMail.cpp
index a88ef43710..68d006b1bb 100644
--- a/mailnews/import/src/nsImportMail.cpp
+++ b/mailnews/import/src/nsImportMail.cpp
@@ -907,12 +907,12 @@ bool nsImportGenericMail::CreateFolder(nsIMsgFolder **ppFolder)
   nsString folderName;
   if (!m_pName.IsEmpty()) {
     const char16_t *moduleName[] = { m_pName.get() };
-    rv = bundle->FormatStringFromName(MOZ_UTF16("ImportModuleFolderName"),
+    rv = bundle->FormatStringFromName(u"ImportModuleFolderName",
                                       moduleName, 1,
                                       getter_Copies(folderName));
   }
   else {
-    rv = bundle->GetStringFromName(MOZ_UTF16("DefaultFolderName"),
+    rv = bundle->GetStringFromName(u"DefaultFolderName",
                                    getter_Copies(folderName));
   }
   if (NS_FAILED(rv)) {
diff --git a/mailnews/intl/nsCharsetConverterManager.cpp b/mailnews/intl/nsCharsetConverterManager.cpp
index cbd93e1c4b..e434ecd415 100644
--- a/mailnews/intl/nsCharsetConverterManager.cpp
+++ b/mailnews/intl/nsCharsetConverterManager.cpp
@@ -111,7 +111,7 @@ bool nsCharsetConverterManager::IsInternal(const nsACString& aCharset)
   nsAutoString str;
   // fully qualify to possibly avoid vtable call
   nsresult rv = GetCharsetDataImpl(PromiseFlatCString(aCharset).get(),
-                                   MOZ_UTF16(".isInternal"),
+                                   u".isInternal",
                                    str);
 
   return NS_SUCCEEDED(rv);
@@ -345,7 +345,7 @@ nsCharsetConverterManager::GetCharsetLangGroupRaw(const char * aCharset,
   nsAutoString langGroup;
   // fully qualify to possibly avoid vtable call
   nsresult rv = nsCharsetConverterManager::GetCharsetData(
-      aCharset, MOZ_UTF16(".LangGroup"), langGroup);
+      aCharset, u".LangGroup", langGroup);
 
   if (NS_SUCCEEDED(rv)) {
     ToLowerCase(langGroup); // use lowercase for all language atoms
diff --git a/mailnews/local/src/nsLocalMailFolder.cpp b/mailnews/local/src/nsLocalMailFolder.cpp
index 627e77fafc..f7959f9b6b 100644
--- a/mailnews/local/src/nsLocalMailFolder.cpp
+++ b/mailnews/local/src/nsLocalMailFolder.cpp
@@ -844,19 +844,19 @@ nsresult nsMsgLocalMailFolder::ConfirmFolderDeletion(nsIMsgWindow *aMsgWindow,
 
       nsAutoString deleteFolderDialogTitle;
       rv = bundle->GetStringFromName(
-        MOZ_UTF16("pop3DeleteFolderDialogTitle"),
+        u"pop3DeleteFolderDialogTitle",
         getter_Copies(deleteFolderDialogTitle));
       NS_ENSURE_SUCCESS(rv, rv);
 
       nsAutoString deleteFolderButtonLabel;
       rv = bundle->GetStringFromName(
-        MOZ_UTF16("pop3DeleteFolderButtonLabel"),
+        u"pop3DeleteFolderButtonLabel",
         getter_Copies(deleteFolderButtonLabel));
       NS_ENSURE_SUCCESS(rv, rv);
 
       nsAutoString confirmationStr;
       rv = bundle->FormatStringFromName(
-        MOZ_UTF16("pop3MoveFolderToTrash"), formatStrings, 1,
+        u"pop3MoveFolderToTrash", formatStrings, 1,
         getter_Copies(confirmationStr));
       NS_ENSURE_SUCCESS(rv, rv);
 
@@ -3316,8 +3316,8 @@ nsresult nsMsgLocalMailFolder::DisplayMoveCopyStatusMsg()
       const char16_t * stringArray[] = { numMsgSoFarString.get(), totalMessagesString.get(), folderName.get() };
       rv = mCopyState->m_stringBundle->FormatStringFromName(
         (mCopyState->m_isMove) ?
-        MOZ_UTF16("movingMessagesStatus") :
-        MOZ_UTF16("copyingMessagesStatus"),
+        u"movingMessagesStatus" :
+        u"copyingMessagesStatus",
         stringArray, 3, getter_Copies(finalString));
       int64_t nowMS = PR_IntervalToMilliseconds(PR_IntervalNow());
 
diff --git a/mailnews/local/src/nsPop3Protocol.cpp b/mailnews/local/src/nsPop3Protocol.cpp
index 663619727f..501be72307 100644
--- a/mailnews/local/src/nsPop3Protocol.cpp
+++ b/mailnews/local/src/nsPop3Protocol.cpp
@@ -860,19 +860,19 @@ NS_IMETHODIMP nsPop3Protocol::OnPromptStart(bool *aResult)
       }
     }
     mLocalBundle->FormatStringFromName(
-      MOZ_UTF16("pop3PreviouslyEnteredPasswordIsInvalidPrompt"),
+      u"pop3PreviouslyEnteredPasswordIsInvalidPrompt",
       passwordParams, 2, getter_Copies(passwordPrompt));
   }
   else
     // Otherwise this is the first time we've asked about the server's
     // password so show a first time prompt.
     mLocalBundle->FormatStringFromName(
-      MOZ_UTF16("pop3EnterPasswordPrompt"),
+      u"pop3EnterPasswordPrompt",
       passwordParams, 2, getter_Copies(passwordPrompt));
 
   nsString passwordTitle;
   mLocalBundle->GetStringFromName(
-    MOZ_UTF16("pop3EnterPasswordPromptTitle"),
+    u"pop3EnterPasswordPromptTitle",
     getter_Copies(passwordTitle));
 
   // Now go and get the password.
@@ -1268,7 +1268,7 @@ nsPop3Protocol::Error(const char* err_code,
     const char16_t *titleParams[] = { accountName.get() };
     nsString dialogTitle;
     mLocalBundle->FormatStringFromName(
-      MOZ_UTF16("pop3ErrorDialogTitle"),
+      u"pop3ErrorDialogTitle",
       titleParams, 1, getter_Copies(dialogTitle));
     nsCOMPtr<nsIMsgMailNewsUrl> mailnewsUrl = do_QueryInterface(m_url, &rv);
     // we handle "pop3TmpDownloadError" earlier...
@@ -1306,7 +1306,7 @@ nsPop3Protocol::Error(const char* err_code,
                   CopyASCIItoUTF16(hostName, hostStr);
                   const char16_t *params[] = { hostStr.get() };
                   mLocalBundle->FormatStringFromName(
-                    MOZ_UTF16("pop3ServerSaid"),
+                    u"pop3ServerSaid",
                     params, 1, getter_Copies(serverSaidPrefix));
                 }
 
@@ -3453,7 +3453,7 @@ nsPop3Protocol::TopResponse(nsIInputStream* inputStream, uint32_t length)
 
     nsString statusTemplate;
     mLocalBundle->GetStringFromName(
-      MOZ_UTF16("pop3ServerDoesNotSupportTopCommand"),
+      u"pop3ServerDoesNotSupportTopCommand",
       getter_Copies(statusTemplate));
     if (!statusTemplate.IsEmpty())
     {
@@ -3831,7 +3831,7 @@ nsresult nsPop3Protocol::ProcessProtocolState(nsIURI * url, nsIInputStream * aIn
       break;
 
     case POP3_AUTH_GSSAPI_FIRST:
-      UpdateStatus(MOZ_UTF16("hostContact"));
+      UpdateStatus(u"hostContact");
       status = AuthGSSAPIResponse(true);
       break;
 
@@ -3849,7 +3849,7 @@ nsresult nsPop3Protocol::ProcessProtocolState(nsIURI * url, nsIInputStream * aIn
       break;
 
     case POP3_FINISH_OBTAIN_PASSWORD_BEFORE_USERNAME:
-      UpdateStatus(MOZ_UTF16("hostContact"));
+      UpdateStatus(u"hostContact");
       status = SendUsername();
       break;
 
@@ -3957,7 +3957,7 @@ nsresult nsPop3Protocol::ProcessProtocolState(nsIURI * url, nsIInputStream * aIn
 
           if (m_totalDownloadSize <= 0)
           {
-            UpdateStatus(MOZ_UTF16("noNewMessages"));
+            UpdateStatus(u"noNewMessages");
             /* There are no new messages.  */
           }
           else
diff --git a/mailnews/local/src/nsPop3Service.cpp b/mailnews/local/src/nsPop3Service.cpp
index 6c7367e312..d0177b5595 100644
--- a/mailnews/local/src/nsPop3Service.cpp
+++ b/mailnews/local/src/nsPop3Service.cpp
@@ -466,10 +466,10 @@ void nsPop3Service::AlertServerBusy(nsIMsgMailNewsUrl *url)
   nsString alertString;
   nsString dialogTitle;
   bundle->FormatStringFromName(
-    MOZ_UTF16("pop3ServerBusy"),
+    u"pop3ServerBusy",
     params, 1, getter_Copies(alertString));
   bundle->FormatStringFromName(
-    MOZ_UTF16("pop3ErrorDialogTitle"),
+    u"pop3ErrorDialogTitle",
     params, 1, getter_Copies(dialogTitle));
   if (!alertString.IsEmpty())
     dialog->Alert(dialogTitle.get(), alertString.get());
diff --git a/mailnews/local/src/nsPop3Sink.cpp b/mailnews/local/src/nsPop3Sink.cpp
index 2902a529a4..d81741305a 100644
--- a/mailnews/local/src/nsPop3Sink.cpp
+++ b/mailnews/local/src/nsPop3Sink.cpp
@@ -690,7 +690,7 @@ nsresult nsPop3Sink::HandleTempDownloadFailed(nsIMsgWindow *msgWindow)
   m_newMailParser->m_newMsgHdr->GetMime2DecodedAuthor(fromStr);
   const char16_t *params[] = { fromStr.get(), subjectStr.get() };
   bundle->FormatStringFromName(
-    MOZ_UTF16("pop3TmpDownloadError"),
+    u"pop3TmpDownloadError",
     params, 2, getter_Copies(confirmString));
   nsCOMPtr<mozIDOMWindowProxy> parentWindow;
   nsCOMPtr<nsIPromptService> promptService = do_GetService(NS_PROMPTSERVICE_CONTRACTID);
diff --git a/mailnews/mapi/mapihook/src/msgMapiHook.cpp b/mailnews/mapi/mapihook/src/msgMapiHook.cpp
index 345753f113..0473f13f53 100644
--- a/mailnews/mapi/mapihook/src/msgMapiHook.cpp
+++ b/mailnews/mapi/mapihook/src/msgMapiHook.cpp
@@ -146,7 +146,7 @@ bool nsMapiHook::DisplayLoginDialog(bool aLogin, char16_t **aUsername,
 
     nsString brandName;
     rv = brandBundle->GetStringFromName(
-                       MOZ_UTF16("brandFullName"),
+                       u"brandFullName",
                        getter_Copies(brandName));
     if (NS_FAILED(rv)) return false;
 
@@ -161,7 +161,7 @@ bool nsMapiHook::DisplayLoginDialog(bool aLogin, char16_t **aUsername,
     if (aLogin)
     {
       nsString loginText;
-      rv = bundle->GetStringFromName(MOZ_UTF16("loginTextwithName"),
+      rv = bundle->GetStringFromName(u"loginTextwithName",
                                      getter_Copies(loginText));
       if (NS_FAILED(rv) || loginText.IsEmpty()) return false;
 
@@ -255,12 +255,12 @@ nsMapiHook::IsBlindSendAllowed()
   if (NS_FAILED(rv) || !bundle) return false;
 
   nsString warningMsg;
-  rv = bundle->GetStringFromName(MOZ_UTF16("mapiBlindSendWarning"),
+  rv = bundle->GetStringFromName(u"mapiBlindSendWarning",
                                       getter_Copies(warningMsg));
   if (NS_FAILED(rv)) return false;
 
   nsString dontShowAgainMessage;
-  rv = bundle->GetStringFromName(MOZ_UTF16("mapiBlindSendDontShowAgain"),
+  rv = bundle->GetStringFromName(u"mapiBlindSendDontShowAgain",
                                       getter_Copies(dontShowAgainMessage));
   if (NS_FAILED(rv)) return false;
 
diff --git a/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.cpp b/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.cpp
index 2253ee867b..de4ec31745 100644
--- a/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.cpp
+++ b/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.cpp
@@ -58,7 +58,7 @@ static nsCString determineMimePart(MimeObject* obj);
 
 
 #define PGPMIME_PROPERTIES_URL        "chrome://messenger/locale/pgpmime.properties"
-#define PGPMIME_STR_NOT_SUPPORTED_ID  "pgpMimeNeedsAddon"
+#define PGPMIME_STR_NOT_SUPPORTED_ID  u"pgpMimeNeedsAddon"
 #define PGPMIME_URL_PREF              "mail.pgpmime.addon_url"
 
 static void PgpMimeGetNeedsAddonString(nsCString &aResult)
@@ -87,7 +87,7 @@ static void PgpMimeGetNeedsAddonString(nsCString &aResult)
   const char16_t *formatStrings[] = { url16.get() };
 
   nsString result;
-  rv = stringBundle->FormatStringFromName(MOZ_UTF16(PGPMIME_STR_NOT_SUPPORTED_ID),
+  rv = stringBundle->FormatStringFromName(PGPMIME_STR_NOT_SUPPORTED_ID,
                                           formatStrings, 1, getter_Copies(result));
   if (NS_FAILED(rv))
     return;
diff --git a/mailnews/mime/emitters/nsMimeBaseEmitter.cpp b/mailnews/mime/emitters/nsMimeBaseEmitter.cpp
index 8af9612bfd..d3a4aeb225 100644
--- a/mailnews/mime/emitters/nsMimeBaseEmitter.cpp
+++ b/mailnews/mime/emitters/nsMimeBaseEmitter.cpp
@@ -740,7 +740,7 @@ nsMimeBaseEmitter::GenerateDateString(const char * dateString,
                                 explodedMsgTime.tm_params.tp_dst_offset) / 60;
         // append offset to date string
         char16_t *tzstring =
-          nsTextFormatter::smprintf(MOZ_UTF16(" %+05d"),
+          nsTextFormatter::smprintf(u" %+05d",
                                     (senderoffset / 60 * 100) +
                                     (senderoffset % 60));
         formattedDateString.Append(tzstring);
diff --git a/mailnews/mime/emitters/nsMimeHtmlEmitter.cpp b/mailnews/mime/emitters/nsMimeHtmlEmitter.cpp
index 44139a3d44..d68d7f15c8 100644
--- a/mailnews/mime/emitters/nsMimeHtmlEmitter.cpp
+++ b/mailnews/mime/emitters/nsMimeHtmlEmitter.cpp
@@ -419,7 +419,7 @@ nsMimeHtmlDisplayEmitter::StartAttachmentInBody(const nsACString &name,
       NS_ENSURE_SUCCESS(rv, rv);
 
       nsString attachmentsHeader;
-      bundle->GetStringFromName(MOZ_UTF16("attachmentsPrintHeader"),
+      bundle->GetStringFromName(u"attachmentsPrintHeader",
                                 getter_Copies(attachmentsHeader)); 
 
       UtilityWrite("<legend class=\"mimeAttachmentHeaderName\">");
diff --git a/mailnews/mime/src/mimemsg.cpp b/mailnews/mime/src/mimemsg.cpp
index 31684766aa..2e8ff0ce08 100644
--- a/mailnews/mime/src/mimemsg.cpp
+++ b/mailnews/mime/src/mimemsg.cpp
@@ -866,16 +866,16 @@ MimeMessage_partial_message_html(const char *data, void *closure,
 
   partialMsgHtml.AppendLiteral("<span style=\"font-size: 120%;\">");
   if (msgBaseTruncated)
-    item.Adopt(MimeGetStringByName(MOZ_UTF16("MIME_MSG_PARTIAL_TRUNCATED")));
+    item.Adopt(MimeGetStringByName(u"MIME_MSG_PARTIAL_TRUNCATED"));
   else
-    item.Adopt(MimeGetStringByName(MOZ_UTF16("MIME_MSG_PARTIAL_NOT_DOWNLOADED")));
+    item.Adopt(MimeGetStringByName(u"MIME_MSG_PARTIAL_NOT_DOWNLOADED"));
   partialMsgHtml += item;
   partialMsgHtml.AppendLiteral("</span><hr>");
 
   if (msgBaseTruncated)
-    item.Adopt(MimeGetStringByName(MOZ_UTF16("MIME_MSG_PARTIAL_TRUNCATED_EXPLANATION")));
+    item.Adopt(MimeGetStringByName(u"MIME_MSG_PARTIAL_TRUNCATED_EXPLANATION"));
   else
-    item.Adopt(MimeGetStringByName(MOZ_UTF16("MIME_MSG_PARTIAL_NOT_DOWNLOADED_EXPLANATION")));
+    item.Adopt(MimeGetStringByName(u"MIME_MSG_PARTIAL_NOT_DOWNLOADED_EXPLANATION"));
   partialMsgHtml += item;
   partialMsgHtml.AppendLiteral("<br><br>");
 
@@ -901,7 +901,7 @@ MimeMessage_partial_message_html(const char *data, void *closure,
   }
 
   partialMsgHtml.AppendLiteral("\">");
-  item.Adopt(MimeGetStringByName(MOZ_UTF16("MIME_MSG_PARTIAL_CLICK_FOR_REST")));
+  item.Adopt(MimeGetStringByName(u"MIME_MSG_PARTIAL_CLICK_FOR_REST"));
   partialMsgHtml += item;
   partialMsgHtml.AppendLiteral("</a>");
 
diff --git a/mailnews/news/src/nsNNTPNewsgroupList.cpp b/mailnews/news/src/nsNNTPNewsgroupList.cpp
index 630ea40421..b6e24f207b 100644
--- a/mailnews/news/src/nsNNTPNewsgroupList.cpp
+++ b/mailnews/news/src/nsNNTPNewsgroupList.cpp
@@ -316,7 +316,7 @@ nsNNTPNewsgroupList::GetRangeOfArtsToDownload(nsIMsgWindow *aMsgWindow,
     rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = bundle->GetStringFromName(MOZ_UTF16("noNewMessages"), getter_Copies(statusString));
+    rv = bundle->GetStringFromName(u"noNewMessages", getter_Copies(statusString));
     NS_ENSURE_SUCCESS(rv, rv);
 
     SetProgressStatus(statusString.get());
@@ -886,7 +886,7 @@ nsNNTPNewsgroupList::FinishXOVERLINE(int status, int *newstatus)
       NS_ENSURE_SUCCESS(rv, rv);
 
       const char16_t *formatStrings[2] = { firstStr.get(), lastStr.get() };
-      rv = bundle->FormatStringFromName(MOZ_UTF16("downloadingArticles"), formatStrings, 2, getter_Copies(statusString));
+      rv = bundle->FormatStringFromName(u"downloadingArticles", formatStrings, 2, getter_Copies(statusString));
       NS_ENSURE_SUCCESS(rv, rv);
 
       SetProgressStatus(statusString.get());
@@ -1253,7 +1253,7 @@ nsNNTPNewsgroupList::SetProgressStatus(const char16_t *aMessage)
                              getter_AddRefs(bundle));
       NS_ENSURE_SUCCESS_VOID(rv);
       const char16_t *params[] = { accountName.get(), aMessage };
-      bundle->FormatStringFromName(MOZ_UTF16("statusMessage"),
+      bundle->FormatStringFromName(u"statusMessage",
                                    params, 2, getter_Copies(statusMessage));
 
       feedback->ShowStatusString(statusMessage);
@@ -1295,14 +1295,14 @@ nsNNTPNewsgroupList::UpdateStatus(bool filtering, int32_t numDLed, int32_t totTo
     NS_ConvertUTF8toUTF16 header(m_filterHeaders[m_currentXHDRIndex]);
     const char16_t *formatStrings[4] = { header.get(),
       numDownloadedStr.get(), totalToDownloadStr.get(), newsgroupName.get() };
-    rv = bundle->FormatStringFromName(MOZ_UTF16("newNewsgroupFilteringHeaders"),
+    rv = bundle->FormatStringFromName(u"newNewsgroupFilteringHeaders",
       formatStrings, 4, getter_Copies(statusString));
   }
   else
   {
     const char16_t *formatStrings[3] = { numDownloadedStr.get(),
       totalToDownloadStr.get(), newsgroupName.get() };
-    rv = bundle->FormatStringFromName(MOZ_UTF16("newNewsgroupHeaders"),
+    rv = bundle->FormatStringFromName(u"newNewsgroupHeaders",
       formatStrings, 3, getter_Copies(statusString));
   }
   if (!NS_SUCCEEDED(rv))
diff --git a/mailnews/news/src/nsNNTPProtocol.cpp b/mailnews/news/src/nsNNTPProtocol.cpp
index b3711b4dac..40053a1fef 100644
--- a/mailnews/news/src/nsNNTPProtocol.cpp
+++ b/mailnews/news/src/nsNNTPProtocol.cpp
@@ -1041,7 +1041,7 @@ nsresult nsNNTPProtocol::LoadUrl(nsIURI * aURL, nsISupports * aConsumer)
       const char16_t *formatStrings[1] = { unescapedName.get() };
 
       rv = bundle->FormatStringFromName(
-        MOZ_UTF16("autoSubscribeText"), formatStrings, 1,
+        u"autoSubscribeText", formatStrings, 1,
         getter_Copies(confirmText));
       NS_ENSURE_SUCCESS(rv,rv);
 
@@ -2778,7 +2778,7 @@ nsresult nsNNTPProtocol::ReadNewsList(nsIInputStream * inputStream, uint32_t len
       NS_ConvertASCIItoUTF16 rateStr(rate_buf);
 
       const char16_t *formatStrings[3] = { numGroupsStr.get(), bytesStr.get(), rateStr.get()};
-      rv = bundle->FormatStringFromName(MOZ_UTF16("bytesReceived"),
+      rv = bundle->FormatStringFromName(u"bytesReceived",
         formatStrings, 3,
         getter_Copies(statusString));
 
@@ -3545,7 +3545,7 @@ nsresult nsNNTPProtocol::DoCancel()
   NS_ENSURE_TRUE(brandBundle, NS_ERROR_FAILURE);
 
   nsString brandFullName;
-  rv = brandBundle->GetStringFromName(MOZ_UTF16("brandFullName"),
+  rv = brandBundle->GetStringFromName(u"brandFullName",
                                       getter_Copies(brandFullName));
   NS_ENSURE_SUCCESS(rv,rv);
   NS_ConvertUTF16toUTF8 appName(brandFullName);
diff --git a/mailnews/news/src/nsNewsDownloader.cpp b/mailnews/news/src/nsNewsDownloader.cpp
index 0ef3c4911b..0794e30e7c 100644
--- a/mailnews/news/src/nsNewsDownloader.cpp
+++ b/mailnews/news/src/nsNewsDownloader.cpp
@@ -197,7 +197,7 @@ bool nsNewsDownloader::GetNextHdrToRetrieve()
     m_folder->GetPrettiestName(prettiestName);
 
     const char16_t *formatStrings[3] = { firstStr.get(), totalStr.get(), prettiestName.get() };
-    rv = bundle->FormatStringFromName(MOZ_UTF16("downloadingArticlesForOffline"),
+    rv = bundle->FormatStringFromName(u"downloadingArticlesForOffline",
                                       formatStrings, 3, getter_Copies(statusString));
     NS_ENSURE_SUCCESS(rv, false);
     ShowProgress(statusString.get(), percent);
diff --git a/mailnews/news/src/nsNewsFolder.cpp b/mailnews/news/src/nsNewsFolder.cpp
index 53637b6b5e..e7a3386cbc 100644
--- a/mailnews/news/src/nsNewsFolder.cpp
+++ b/mailnews/news/src/nsNewsFolder.cpp
@@ -1238,7 +1238,7 @@ nsMsgNewsFolder::GetAuthenticationCredentials(nsIMsgWindow *aMsgWindow,
     {
       // Format the prompt text strings
       nsString promptTitle, promptText;
-      bundle->GetStringFromName(MOZ_UTF16("enterUserPassTitle"),
+      bundle->GetStringFromName(u"enterUserPassTitle",
         getter_Copies(promptTitle));
 
       nsString serverName;
@@ -1260,11 +1260,11 @@ nsMsgNewsFolder::GetAuthenticationCredentials(nsIMsgWindow *aMsgWindow,
       params[1] = serverName.get();
       if (singleSignon)
         bundle->FormatStringFromName(
-          MOZ_UTF16("enterUserPassServer"),
+          u"enterUserPassServer",
           &params[1], 1, getter_Copies(promptText));
       else
         bundle->FormatStringFromName(
-          MOZ_UTF16("enterUserPassGroup"),
+          u"enterUserPassGroup",
           params, 2, getter_Copies(promptText));
 
       // Fill the signon url for the dialog
diff --git a/mailnews/news/src/nsNntpIncomingServer.cpp b/mailnews/news/src/nsNntpIncomingServer.cpp
index 67effd3b44..13c9feb249 100644
--- a/mailnews/news/src/nsNntpIncomingServer.cpp
+++ b/mailnews/news/src/nsNntpIncomingServer.cpp
@@ -1584,7 +1584,7 @@ nsNntpIncomingServer::GroupNotFound(nsIMsgWindow *aMsgWindow,
   const char16_t *formatStrings[2] = { groupName.get(), hostStr.get() };
   nsString confirmText;
   rv = bundle->FormatStringFromName(
-                    MOZ_UTF16("autoUnsubscribeText"),
+                    u"autoUnsubscribeText",
                     formatStrings, 2,
                     getter_Copies(confirmText));
   NS_ENSURE_SUCCESS(rv,rv);
diff --git a/suite/shell/src/nsGNOMEShellService.cpp b/suite/shell/src/nsGNOMEShellService.cpp
index 1a9022c1f0..6134aaa9e9 100644
--- a/suite/shell/src/nsGNOMEShellService.cpp
+++ b/suite/shell/src/nsGNOMEShellService.cpp
@@ -86,7 +86,7 @@ GetBrandName(nsACString& aBrandName)
   NS_ENSURE_TRUE(brandBundle, rv);
 
   nsString brandName;
-  rv = brandBundle->GetStringFromName(MOZ_UTF16("brandShortName"),
+  rv = brandBundle->GetStringFromName(u"brandShortName",
                                       getter_Copies(brandName));
   NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/suite/shell/src/nsWindowsShellService.cpp b/suite/shell/src/nsWindowsShellService.cpp
index ee2ba6be78..9d9515f021 100644
--- a/suite/shell/src/nsWindowsShellService.cpp
+++ b/suite/shell/src/nsWindowsShellService.cpp
@@ -775,7 +775,7 @@ nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement,
   // e.g. "Desktop Background.bmp"
   nsString fileLeafName;
   rv = shellBundle->GetStringFromName
-                      (MOZ_UTF16("desktopBackgroundLeafNameWin"),
+                      (u"desktopBackgroundLeafNameWin",
                        getter_Copies(fileLeafName));
   NS_ENSURE_SUCCESS(rv, rv);