diff --git a/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp b/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp index 502540611950..2dddb433875e 100644 --- a/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp +++ b/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp @@ -491,10 +491,10 @@ nsresult nsMapiRegistryUtils::setDefaultMailClient() nsXPIDLString defaultMailTitle; // Use vendorName instead of brandname since brandName is product name // and has more than just the name of the application - const PRUnichar *keyValuePrefixStr[] = { vendorName(), versionNo() }; + const PRUnichar *keyValuePrefixStr[] = { vendorName() }; NS_NAMED_LITERAL_STRING(defaultMailTitleTag, "defaultMailDisplayTitle"); rv = bundle->FormatStringFromName(defaultMailTitleTag.get(), - keyValuePrefixStr, 2, + keyValuePrefixStr, 1, getter_Copies(defaultMailTitle)); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; diff --git a/mailnews/mapi/resources/locale/en-US/mapi.properties b/mailnews/mapi/resources/locale/en-US/mapi.properties index 8ece7a332005..d820a5981e2c 100644 --- a/mailnews/mapi/resources/locale/en-US/mapi.properties +++ b/mailnews/mapi/resources/locale/en-US/mapi.properties @@ -18,6 +18,6 @@ mapiBlindSendWarning=Another application is attempting to send mail using your u mapiBlindSendDontShowAgain=Warn me whenever other applications try to send mail from me #Default Mail Display String -# localization note, $1%S is the app name, $2%S is the version -defaultMailDisplayTitle=%S %S Mail +# localization note, %S is the vendor name +defaultMailDisplayTitle=%S Mail diff --git a/xpinstall/packager/windows/mail.jst b/xpinstall/packager/windows/mail.jst index 5d24a5905062..5d7d227d67b5 100644 --- a/xpinstall/packager/windows/mail.jst +++ b/xpinstall/packager/windows/mail.jst @@ -264,7 +264,7 @@ function updateMapi() var winsysMapi32File; var mapiProxyFile; var subkey; - var mailDefaultDescription = "$ProductName$ $UserAgentShort$ Mail"; + var mailDefaultDescription = "$ProductName$ Mail"; winreg = getWinRegistry(); if(winreg != null)