diff --git a/mail/app/profile/localstore.rdf b/mail/app/profile/localstore.rdf
deleted file mode 100644
index cc4b3b5105..0000000000
--- a/mail/app/profile/localstore.rdf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<RDF:RDF
-     xmlns:NC="http://home.netscape.com/NC-rdf#"
-     xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-</RDF:RDF>
diff --git a/mail/app/profile/moz.build b/mail/app/profile/moz.build
index 3b6582126b..03cab40fe0 100644
--- a/mail/app/profile/moz.build
+++ b/mail/app/profile/moz.build
@@ -6,6 +6,5 @@
 DIRS += ['extensions']
 
 FINAL_TARGET_FILES.defaults.profile += [
-    'localstore.rdf',
     'mimeTypes.rdf',
 ]
diff --git a/mail/base/content/safeMode.js b/mail/base/content/safeMode.js
index 367d08113a..9c63881f70 100644
--- a/mail/base/content/safeMode.js
+++ b/mail/base/content/safeMode.js
@@ -14,6 +14,10 @@ function deleteLocalstore() {
   var localstoreFile = Services.dirsvc.get("LStoreS", Components.interfaces.nsIFile);
   if (localstoreFile.exists())
     localstoreFile.remove(false);
+  // Delete the new xulstore file.
+  localstoreFile.leafName = "xulstore.json";
+  if (localstoreFile.exists())
+    localstoreFile.remove(false);
 }
 
 function disableAddons() {
diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in
index 9422f6b326..e20f3839e1 100644
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -158,7 +158,6 @@
 ; Mail Specific Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 @RESPATH@/defaults/messenger/mailViews.dat
-@RESPATH@/defaults/profile/localstore.rdf
 @RESPATH@/defaults/profile/prefs.js
 @RESPATH@/defaults/profile/mimeTypes.rdf