--- a/mailnews/base/src/moz.build
+++ b/mailnews/base/src/moz.build
@@ -70,10 +70,12 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'virtualFolderWrapper.js',
 ]
 LOCAL_INCLUDES += [
   '/%s/dom/base' % CONFIG['mozreltopsrcdir'],
 ]
 
+include('/%s/ipc/chromium/chromium-config.mozbuild' % CONFIG['mozreltopsrcdir'])
+
 FINAL_LIBRARY = 'mail'
 

--- a/mailnews/base/src/nsMessengerWinIntegration.cpp
+++ b/mailnews/base/src/nsMessengerWinIntegration.cpp
@@ -48,17 +48,17 @@
 #include "mozilla/DebugOnly.h"
 #include "nsIMutableArray.h"
 #include "nsArrayUtils.h"
 
 #include "mozilla/Components.h"
 #include <stdlib.h>
 #define PROFILE_COMMANDLINE_ARG u" -profile "
 
-#define NOTIFICATIONCLASSNAME "MailBiffNotificationMessageWindow"
+#define NOTIFICATIONCLASSNAME L"MailBiffNotificationMessageWindow"
 #define UNREADMAILNODEKEY \
   u"Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail\\"
 #define DOUBLE_QUOTE '"'
 #define MAIL_COMMANDLINE_ARG u" -mail"
 #define IDI_MAILBIFF 32576
 #define UNREAD_UPDATE_INTERVAL (20 * 1000)  // 20 seconds
 #define ALERT_CHROME_URL "chrome://messenger/content/newmailalert.xul"
 #define NEW_MAIL_ALERT_ICON "chrome://messenger/skin/icons/new-mail-alert.png"
@@ -903,18 +903,18 @@ nsresult nsMessengerWinIntegration::Remo
       sizeof(registryUnreadMailCountKey)))) {
     if (wcscmp(registryUnreadMailCountKey, currentUnreadMailCountKey.get()) ==
         0) {
       nsAutoString deleteKey;
       deleteKey.Assign(UNREADMAILNODEKEY);
       deleteKey.Append(currentUnreadMailCountKey.get());
 
       if (!deleteKey.IsEmpty()) {
-        // delete this key and berak out of the loop
-        RegDeleteKey(HKEY_CURRENT_USER, NS_ConvertUTF16toUTF8(deleteKey).get());
+        // delete this key and break out of the loop
+        RegDeleteKey(HKEY_CURRENT_USER, deleteKey.get());
         break;
       } else {
         index++;
       }
     } else {
       index++;
     }
   }