diff -ru a/chrome/content/integration/contentAreaUtils.js b/chrome/content/integration/contentAreaUtils.js
--- a/chrome/content/integration/contentAreaUtils.js	2017-09-03 19:40:22.000000000 -0400
+++ b/chrome/content/integration/contentAreaUtils.js	2018-07-01 21:03:08.000000000 -0400
@@ -148,6 +148,7 @@
         // The ExactPersist component can also save XML and SVG, but not as
         // accurately as the browser's standard save system.
         persistObject = new MozillaArchiveFormat.ExactPersist();
+        persistObject.includeOriginalUrl = true;
       }
 
       // Wrap the persist object for propagation to makeWebBrowserPersist.
diff -ru a/chrome/content/integration/mafCommandsOverlay.js b/chrome/content/integration/mafCommandsOverlay.js
--- a/chrome/content/integration/mafCommandsOverlay.js	2017-02-27 17:51:18.000000000 -0500
+++ b/chrome/content/integration/mafCommandsOverlay.js	2018-07-01 21:03:08.000000000 -0400
@@ -148,7 +148,8 @@
 
       // Determine which class of MAF menu item we are handling.
       var command = element.getAttribute("command");
-      if (command.slice(0, "mafCmd".length) == "mafCmd") {
+      if (command.startsWith("mafCmd") &&
+          command != "mafCmdConvertSavedPages") {
 
         // If the element has a different label based on whether the page will
         // be saved automatically, change the label accordingly.
@@ -167,10 +168,7 @@
     Array.forEach(aEvent.target.getElementsByTagNameNS(
      aEvent.target.namespaceURI, "menuseparator"), function(element) {
 
-      // Filter out unrelated separators.
-      if (["mafMenuSaveSeparator_fileMenu",
-       "mafMenuConvertSeparator_fileMenu",
-       "mafMenuSaveSeparator_tabsContextMenu"].indexOf(element.id) >= 0) {
+      if (element.id == "mafMenuSaveSeparator_tabsContextMenu") {
         // Set visibility assuming that at least one MAF item is visible in the
         // menus that actually have a separator, if the user preference for
         // showing items in the menu is enabled.
@@ -204,9 +202,9 @@
    */
   saveTabsInArchive: function() {
     // Ensure all the background tabs are loaded while the selection is made.
-    for (let browser of gBrowser.browsers) {
-      if (browser.hasAttribute("pending")) {
-        browser.reload();
+    for (let tab of gBrowser.tabs) {
+      if (tab.hasAttribute("pending")) {
+        tab.linkedBrowser.reload();
       }
     }
     // Open a dialog that lets the user select which tabs will be saved. See
diff -ru a/chrome/content/integration/mafInterfaceOverlay.js b/chrome/content/integration/mafInterfaceOverlay.js
--- a/chrome/content/integration/mafInterfaceOverlay.js	2015-09-13 21:33:58.000000000 -0400
+++ b/chrome/content/integration/mafInterfaceOverlay.js	2018-07-01 21:24:58.000000000 -0400
@@ -97,10 +97,6 @@
     if (aEvent.button != 0)
       return;
 
-    // Make sure that clicking outside the popup cannot reopen it accidentally.
-    this._archiveInfoPopup.popupBoxObject.
-     setConsumeRollupEvent(Ci.nsIPopupBoxObject.ROLLUP_CONSUME);
-
     // Open the popup near the address bar icon.
     this._archiveInfoPopup.openPopup(this._archiveInfoUrlbarButton,
                                      "bottomcenter topright");
diff -ru a/chrome/content/MozillaArchiveFormat.jsm b/chrome/content/MozillaArchiveFormat.jsm
--- a/chrome/content/MozillaArchiveFormat.jsm	2017-02-27 11:29:50.000000000 -0500
+++ b/chrome/content/MozillaArchiveFormat.jsm	2018-07-01 20:44:48.000000000 -0400
@@ -5,7 +5,9 @@
 const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Promise.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 
 let objectsByFolder = {
diff -ru a/chrome/content/preferences/prefsDialog.xul b/chrome/content/preferences/prefsDialog.xul
--- a/chrome/content/preferences/prefsDialog.xul	2017-07-09 13:35:44.000000000 -0400
+++ b/chrome/content/preferences/prefsDialog.xul	2018-07-01 21:09:45.000000000 -0400
@@ -130,22 +130,6 @@
               accesskey= "&info.bar.accesskey;"
               />
     </vbox>
-    <vbox id="boxMultiprocess">
-    <spacer height="10" />
-    <label value="Disable multi-process to use the Mozilla Archive Format add-on"
-           class="header"/>
-    <description>
-      Multi-process mode should have been disabled automatically when the add-on
-      was installed. This did not happen, probably because you are using a
-      pre-release version of the browser or you have configured multi-process to
-      be always enabled. To continue using the add-on, ensure multi-process is
-      disabled.
-    </description>
-    <spacer height="20" />
-    <description>
-      Read-only access to web archives is possible if sandboxing is disabled.
-    </description>
-    </vbox>
   </prefpane>
 
   <!-- Actions pane -->
@@ -162,26 +146,6 @@
       </description>
       <spacer height="10" />
     </vbox>
-    <vbox id="boxShowWelcomePage">
-      <label value=  "&action.showwelcomepage.label;"
-             onclick="PrefsDialog.onActionShowWelcomePageClick();"
-             class=  "text-link header"
-             />
-      <description class="indent">
-        &action.showwelcomepage.description;
-      </description>
-    </vbox>
-    <vbox id="boxShowWelcomePageAssociate" hidden="true">
-      <label value=  "&action.showwelcomepageassociate.label;"
-             onclick="PrefsDialog.onActionShowWelcomePageClick();"
-             class=  "text-link header"
-             />
-      <description id=   "descShowWelcomePageAssociate"
-                   class="indent"
-                   >
-        &action.showwelcomepageassociate.description;
-      </description>
-    </vbox>
     <spacer height="10" />
     <label value="&action.visitwebsite.label;"
            href= "http://maf.mozdev.org/"
diff -ru a/chrome/content/preferences/Prefs.js b/chrome/content/preferences/Prefs.js
--- a/chrome/content/preferences/Prefs.js	2017-07-09 13:41:30.000000000 -0400
+++ b/chrome/content/preferences/Prefs.js	2018-07-01 21:03:49.000000000 -0400
@@ -105,59 +105,6 @@
   },
 
   /**
-   * Set to true if a beta version of the add-on has previously been installed.
-   */
-  get otherBeta() {
-    return this.prefBranchForMaf.getBoolPref("other.beta");
-  },
-  set otherBeta(aValue) {
-    this.prefBranchForMaf.setBoolPref("other.beta", aValue);
-  },
-
-  /**
-   * Returns true if the page offering the update to the Beta Channel was never
-   * displayed on startup.
-   */
-  get otherDisplayUpdateBetaPage() {
-    return this.prefBranchForMaf.getBoolPref("other.displayupdatebetapage");
-  },
-  set otherDisplayUpdateBetaPage(aValue) {
-    this.prefBranchForMaf.setBoolPref("other.displayupdatebetapage", aValue);
-  },
-
-  /**
-   * Returns false only if a previous version of the extension was installed on
-   * the same profile, indicating that the header of the welcome page should be
-   * changed accordingly.
-   */
-  get otherDisplayWelcome() {
-    return this.prefBranchForMaf.getBoolPref("other.displaywelcome");
-  },
-  set otherDisplayWelcome(aValue) {
-    this.prefBranchForMaf.setBoolPref("other.displaywelcome", aValue);
-  },
-
-  /**
-   * Returns true if the welcome dialog should be displayed on startup.
-   */
-  get otherDisplayWelcomePage() {
-    return this.prefBranchForMaf.getBoolPref("other.displaywelcomepage");
-  },
-  set otherDisplayWelcomePage(aValue) {
-    this.prefBranchForMaf.setBoolPref("other.displaywelcomepage", aValue);
-  },
-
-  /**
-   * Returns true if the multi-process welcome dialog should be displayed.
-   */
-  get otherDisplayWelcomeMultiprocess() {
-    return this.prefBranchForMaf.getBoolPref("other.displayE10Snotice");
-  },
-  set otherDisplayWelcomeMultiprocess(aValue) {
-    this.prefBranchForMaf.setBoolPref("other.displayE10Snotice", aValue);
-  },
-
-  /**
    * Returns true if the browser was already restarted as a workaround for
    * multi-process being erroneously enabled on the Firefox Release channel.
    */
Only in a/chrome/content/preferences: updateBetaPage.js
Only in a/chrome/content/preferences: updateBetaPage.xhtml
Only in a/chrome/content/preferences: welcomePage.js
Only in a/chrome/content/preferences: welcomePage.xhtml
diff -ru a/chrome/content/startup/StartupEvents.js b/chrome/content/startup/StartupEvents.js
--- a/chrome/content/startup/StartupEvents.js	2017-07-09 13:12:52.000000000 -0400
+++ b/chrome/content/startup/StartupEvents.js	2018-07-01 20:48:24.000000000 -0400
@@ -100,11 +100,6 @@
   },
 
   /**
-   * This promise is resolved with the add-on version when it is known.
-   */
-  _promiseAddonVersion: null,
-
-  /**
    * Populates the StartupInitializer.addonVersion property with the version of
    * the installed extension asynchronously.
    */
@@ -113,11 +108,8 @@
     var addonId = "{7f57cf46-4467-4c2d-adfa-0cba7c507e54}";
     let { AddonManager } =
      Cu.import("resource://gre/modules/AddonManager.jsm", {});
-    this._promiseAddonVersion = new Promise(resolve => {
-      AddonManager.getAddonByID(addonId, function (aAddon) {
-        StartupInitializer.addonVersion = aAddon.version;
-        resolve(aAddon.version);
-      });
+    AddonManager.getAddonByID(addonId, function (aAddon) {
+      StartupInitializer.addonVersion = aAddon.version;
     });
   },
 
@@ -133,39 +125,6 @@
   /**
    * Called after all the browser windows have been shown.
    */
-  onWindowsRestored: function() {
-    this.shouldUpdateToBeta().then(shouldUpdateToBeta => {
-      let browserWindow = Services.wm.getMostRecentWindow("navigator:browser");
-      if (!browserWindow) {
-        // Very rarely, it might happen that at this time all browser windows
-        // have already been closed. In this case, we will attempt to show the
-        // welcome page again on the next startup.
-        return;
-      }
-      let browser = browserWindow.getBrowser();
-      if (shouldUpdateToBeta && Prefs.otherDisplayUpdateBetaPage) {
-        // Display the request to update to the Beta Channel as an alternative
-        // welcome page. The normal welcome page with file associations will be
-        // displayed on the next startup if was not shown before.
-        browser.loadTabs(
-         ["chrome://maf/content/preferences/updateBetaPage.xhtml"],
-         false, false);
-        Prefs.otherDisplayUpdateBetaPage = false;
-      } else if (Prefs.otherDisplayWelcomePage) {
-        // Load the page in foreground.
-        browser.loadTabs(["chrome://maf/content/preferences/welcomePage.xhtml"],
-                         false, false);
-        Prefs.otherDisplayWelcomePage = false;
-      }
-      if (Services.appinfo.browserTabsRemoteAutostart &&
-       Prefs.otherDisplayWelcomeMultiprocess) {
-        browserWindow.openDialog(
-         "chrome://maf/content/preferences/prefsDialog.xul", "",
-         "chrome,titlebar,toolbar,centerscreen,modal");
-        Prefs.otherDisplayWelcomeMultiprocess = false;
-      }
-    }).catch(Cu.reportError);
-  },
 
   /**
    * Called when the application is shutting down.
@@ -175,24 +134,10 @@
   },
 
   /**
-   * Returns a promise that resolves to true if the add-on is installed from the
-   * Release channel on a pre-release version of the browser.
+   * Returns true if the application is executing on Windows.
    */
-  shouldUpdateToBeta: function() {
-    return this._promiseAddonVersion.then(version => {
-      try {
-        let isReleaseBrowser = /^(release|esr)($|\-)/.test(
-         UpdateUtils.UpdateChannel);
-        let isBetaAddon = /a|b|rc/.test(version);
-        if (isBetaAddon) {
-          Prefs.otherBeta = true;
-        }
-        return !isReleaseBrowser && !isBetaAddon;
-      } catch (e) {
-        // UpdateUtils.jsm is not available on Firefox 38 ESR, so in case of
-        // exception we assume the browser is a release version.
-        return false;
-      }
-    });
+  _isOnWindows: function() {
+    return Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS ==
+     "WINNT";
   },
 };
Only in a/chrome/skin/preferences: updateBetaPage.css
Only in a/chrome/skin/preferences: welcomePage.css
diff -ru a/defaults/preferences/prefsDefaults.js b/defaults/preferences/prefsDefaults.js
--- a/defaults/preferences/prefsDefaults.js	2017-07-09 13:12:52.000000000 -0400
+++ b/defaults/preferences/prefsDefaults.js	2018-07-01 20:45:39.000000000 -0400
@@ -11,10 +11,5 @@
 pref("extensions.maf.associate.mhtml", true);
 pref("extensions.maf.interface.info.icon", true);
 pref("extensions.maf.interface.info.bar", true);
-pref("extensions.maf.other.beta", false);
-pref("extensions.maf.other.displayupdatebetapage", true);
-pref("extensions.maf.other.displaywelcome", true);
-pref("extensions.maf.other.displaywelcomepage", true);
-pref("extensions.maf.other.displayE10Snotice", true);
 pref("extensions.maf.other.restartingasworkaround", false);
 pref("extensions.maf.save.method", "snapshot");
diff -ru a/install.rdf b/install.rdf
--- a/install.rdf	2017-09-03 19:20:40.000000000 -0400
+++ b/install.rdf	2018-07-01 20:37:10.000000000 -0400
@@ -5,28 +5,37 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>{7f57cf46-4467-4c2d-adfa-0cba7c507e54}</em:id>
-    <em:version>4.1.4</em:version>
+    <em:version>4.1.5</em:version>
     <em:type>2</em:type>
     <em:multiprocessCompatible>false</em:multiprocessCompatible>
 
     <!-- Target Application this extension can install into,
         with minimum and maximum supported versions. -->
-     <!-- Firefox -->
     <em:targetApplication>
       <Description>
-        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>45.0</em:minVersion>
-        <em:maxVersion>45.*</em:maxVersion>
+        <!-- Pale Moon -->
+        <em:id>{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}</em:id>
+        <em:minVersion>27.0.0</em:minVersion>
+        <em:maxVersion>28.*</em:maxVersion>
       </Description>
     </em:targetApplication>
-     <!-- SeaMonkey -->
     <em:targetApplication>
       <Description>
-        <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.46</em:minVersion>
-        <em:maxVersion>2.46.*</em:maxVersion>
+        <!-- Basilisk -->
+        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+        <em:minVersion>52.0</em:minVersion>
+        <em:maxVersion>55.*</em:maxVersion>
+        <em:basilisk>true</em:basilisk>
       </Description>
     </em:targetApplication>
+        <!-- SeaMonkey -->
+        <em:targetApplication>
+            <Description>
+                <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+                <em:minVersion>2.24</em:minVersion>
+                <em:maxVersion>2.49.*</em:maxVersion>
+            </Description>
+        </em:targetApplication>
 
     <!-- Front End MetaData -->
     <em:name>Mozilla Archive Format</em:name>
@@ -38,8 +47,8 @@
     <em:translator>cs: hooonza</em:translator>
     <em:translator>da: Finn S. Sørensen</em:translator>
     <em:translator>de: Lukas Diener, Markus Stadler, o.roth</em:translator>
-    <em:translator>es-ES: Proyecto Nave; http://www.proyectonave.es/</em:translator>
-    <em:translator>fr: Xavier Robin</em:translator>
+    <em:translator>es-ES: Proyecto Nave; http://www.proyectonave.es/, Sole</em:translator>
+    <em:translator>fr: Xavier Robin, Goofy</em:translator>
     <em:translator>hu: JZsolt</em:translator>
     <em:translator>hy-AM: Hrant Ohanyan; http://haysoft.org/</em:translator>
     <em:translator>ja-JP: SATO Kentaro; http://www.ranvis.com/</em:translator>
@@ -50,10 +59,10 @@
     <em:translator>ro: Cătălin ZAMFIRESCU (x10firefox)</em:translator>
     <em:translator>ru: Hr. Burunduk</em:translator>
     <em:translator>sl-SI: Peter Klofutar</em:translator>
-    <em:translator>sv-SE: Mikael Hiort af Ornäs</em:translator>
+    <em:translator>sv-SE: Mikael Hiort af Ornäs, A. Regnander</em:translator>
     <em:translator>tr: Ersen Yoldaç</em:translator>
-    <em:translator>zh-CN: 虞海</em:translator>
-    <em:translator>zh-TW: Samuel Chan C-Y, 虞海</em:translator>
+    <em:translator>zh-CN: 虞海, Sean</em:translator>
+    <em:translator>zh-TW: Samuel Chan C-Y, 虞海, Sean</em:translator>
     <em:homepageURL>http://maf.mozdev.org/</em:homepageURL>
 
     <!-- Front End Integration Hooks (used by Extension Manager)-->
Only in a: META-INF