diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..44ce34d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+web-ext-artifacts
diff --git a/webextension/_locales/de/messages.json b/_locales/de/messages.json
similarity index 90%
rename from webextension/_locales/de/messages.json
rename to _locales/de/messages.json
index c4a676a..9c66f4c 100644
--- a/webextension/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -16,5 +16,8 @@
   },
   "maxRecentFolders.title": {
     "message": "Ändert die Anzahl der zuletzt verwendeten Ordner, die angezeigt werden wenn kein Suchtext eingegeben wurde."
+  },
+  "noResults": {
+    "message": "<Keine Ergebnisse>"
   }
 }
diff --git a/webextension/_locales/en/messages.json b/_locales/en/messages.json
similarity index 90%
rename from webextension/_locales/en/messages.json
rename to _locales/en/messages.json
index 5f9b865..e5ceff2 100644
--- a/webextension/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -16,5 +16,8 @@
   },
   "maxRecentFolders.title": {
     "message": "Changes the number of recent folders shown when no search text is entered."
+  },
+  "noResults": {
+    "message": "<no results>"
   }
 }
diff --git a/webextension/_locales/ru/messages.json b/_locales/ru/messages.json
similarity index 89%
rename from webextension/_locales/ru/messages.json
rename to _locales/ru/messages.json
index 4593e0f..9b08f4a 100644
--- a/webextension/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -16,5 +16,8 @@
   },
   "maxRecentFolders.title": {
     "message": "Изменяет количество последних папок, что отображаются, если не введен текст в поле поиска"
+  },
+  "noResults": {
+    "message": "<Результаты отсутствуют>"
   }
 }
diff --git a/webextension/_locales/uk/messages.json b/_locales/uk/messages.json
similarity index 90%
rename from webextension/_locales/uk/messages.json
rename to _locales/uk/messages.json
index 348ce4f..bf0aa62 100644
--- a/webextension/_locales/uk/messages.json
+++ b/_locales/uk/messages.json
@@ -16,5 +16,8 @@
   },
   "maxRecentFolders.title": {
     "message": "Змінює кількість останніх папок, що відображуються, коли не ввдено жодного тексту в поле пошуку."
+  },
+  "noResults": {
+    "message": "<Результати відсутні>"
   }
 }
diff --git a/bootstrap.js b/bootstrap.js
new file mode 100644
index 0000000..6b6929b
--- /dev/null
+++ b/bootstrap.js
@@ -0,0 +1,256 @@
+/* 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/.
+ * Portions Copyright (C) Philipp Kewisch, 2019 */
+
+var { ExtensionSupport } = ChromeUtils.import(
+  "resource:///modules/ExtensionSupport.jsm"
+);
+
+var { Services } = ChromeUtils.import(
+  "resource://gre/modules/Services.jsm"
+);
+
+/* exported startup, shutdown, install, uninstall */
+
+function initScript(window, document) {
+  Services.scriptloader.loadSubScript("chrome://quickmove/content/quickmove.js", window);
+  window.quickmove.cleanup.push(() => {
+    delete window.quickmove;
+  });
+}
+
+function initCSS(window, document) {
+  let link = document.createElementNS(
+    "http://www.w3.org/1999/xhtml",
+    "link"
+  );
+
+  link.setAttribute("id", "quickmove-styles");
+  link.setAttribute("rel", "stylesheet");
+  link.setAttribute("type", "text/css");
+  link.setAttribute("href", "chrome://quickmove/content/quickmove.css");
+
+  document.documentElement.appendChild(link);
+  window.quickmove.cleanup.push(() => {
+    document.getElementById("quickmove-styles").remove();
+  });
+}
+
+function initKeys(window, document) {
+  document.getElementById("mainPopupSet").appendChild(
+    window.MozXULElement.parseXULToFragment(`
+      <menupopup id="quickmove-menupopup"
+             ignorekeys="true"
+             onpopupshowing="quickmove.popupshowing(event)"
+             onpopupshown="quickmove.popupshown(event)"
+             onpopuphidden="quickmove.hide(event.target)"
+             oncommand="quickmove.command(event, quickmove.executeMove)">
+        <html:input class="quickmove-textbox"
+                    onfocus="quickmove.focus(event)"
+                    onkeypress="quickmove.keypress(event, quickmove.executeMove)"
+                    oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+        <menuseparator class="quickmove-separator"/>
+      </menupopup>
+      <menupopup id="quickmove-goto-menupopup"
+                 ignorekeys="true"
+                 onpopupshowing="quickmove.popupshowing(event)"
+                 onpopupshown="quickmove.popupshown(event)"
+                 onpopuphidden="quickmove.hide(event.target)"
+                 oncommand="quickmove.command(event, quickmove.executeGoto)">
+        <html:input class="quickmove-textbox"
+                    onfocus="quickmove.focus(event)"
+                    onkeypress="quickmove.keypress(event, quickmove.executeGoto)"
+                    oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+        <menuseparator id="quickmove-goto-separator" class="quickmove-separator"/>
+      </menupopup>
+      <menupopup id="quickmove-copy-menupopup"
+                 ignorekeys="true"
+                 onpopupshowing="quickmove.popupshowing(event)"
+                 onpopupshown="quickmove.popupshown(event)"
+                 onpopuphidden="quickmove.hide(event.target)"
+                 oncommand="quickmove.command(event, quickmove.executeCopy)">
+        <html:input class="quickmove-textbox"
+                    onfocus="quickmove.focus(event)"
+                    onkeypress="quickmove.keypress(event, quickmove.executeCopy)"
+                    oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+        <menuseparator id="quickmove-copy-separator" class="quickmove-separator"/>
+      </menupopup>
+    `)
+  );
+
+  document.getElementById("mailKeys").appendChild(
+    window.MozXULElement.parseXULToFragment(`
+      <keyset id="quickmove-keyset">
+        <key id="quickmove-file" key="M" modifiers="shift" oncommand="quickmove.openFile()"/>
+        <key id="quickmove-goto" key="G" modifiers="shift" oncommand="quickmove.openGoto()"/>
+        <key id="quickmove-copy" key="Y" modifiers="shift" oncommand="quickmove.openCopy()"/>
+      </keyset>
+    `)
+  );
+
+  window.quickmove.cleanup.push(() => {
+    document.getElementById("quickmove-keyset").remove();
+    document.getElementById("quickmove-menupopup").remove();
+    document.getElementById("quickmove-copy-menupopup").remove();
+    document.getElementById("quickmove-goto-menupopup").remove();
+  });
+}
+
+function initButtonFile(window, document) {
+  let buttonFile = document.getElementById("button-file") ||
+    document.getElementById("mail-toolbox").palette.querySelector("#button-file");
+
+  let buttonFilePopup = window.MozXULElement.parseXULToFragment(`
+    <menupopup id="quickmove-filebutton-menupopup"
+               ignorekeys="true"
+               onpopupshowing="quickmove.popupshowing(event)"
+               onpopupshown="quickmove.popupshown(event)"
+               onpopuphidden="quickmove.hide(event.target)">
+      <html:input id="quickmove-filebutton-textbox"
+                  onfocus="quickmove.focus(event)"
+                  onkeypress="quickmove.keypress(event, quickmove.executeMove)"
+                  oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+      <menuseparator id="quickmove-filebutton-separator" class="quickmove-separator"/>
+    </menupopup>
+  `);
+
+  let menupopup = buttonFile.querySelector("#button-filePopup");
+
+  buttonFilePopup.oldPopup = buttonFile.replaceChild(buttonFilePopup, menupopup);
+
+  window.quickmove.cleanup.push(() => {
+    buttonFile = document.getElementById("button-file") ||
+      document.getElementById("mail-toolbox").palette.querySelector("#button-file");
+
+    let popup = buttonFile.querySelector("#quickmove-filebutton-menupopup");
+    popup.parentNode.replaceChild(popup.oldPopup, popup);
+  });
+}
+
+function initContextMenus(window, document) {
+  let moveMenu = document.getElementById("mailContext-moveMenu");
+  let quickMoveFileHere = window.MozXULElement.parseXULToFragment(`
+    <menupopup id="quickmove-context-menupopup"
+               ignorekeys="true"
+               onpopupshowing="quickmove.popupshowing(event)"
+               onpopupshown="quickmove.popupshown(event)"
+               onpopuphidden="quickmove.hide(event.target)"
+               oncommand="quickmove.command(event, quickmove.executeMove, true)">
+      <html:input class="quickmove-textbox"
+                  onfocus="quickmove.focus(event)"
+                  onkeypress="quickmove.keypress(event, quickmove.executeMove)"
+                  oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+      <menuseparator class="quickmove-separator"/>
+    </menupopup>
+  `);
+
+  let oldMovePopup = moveMenu.replaceChild(quickMoveFileHere, moveMenu.menupopup);
+
+  let copyMenu = document.getElementById("mailContext-copyMenu");
+  let quickMoveCopyHere = window.MozXULElement.parseXULToFragment(`
+    <menupopup id="quickmove-context-copy-menupopup"
+               ignorekeys="true"
+               onpopupshowing="quickmove.popupshowing(event)"
+               onpopupshown="quickmove.popupshown(event)"
+               onpopuphidden="quickmove.hide(event.target)"
+               oncommand="quickmove.command(event, quickmove.executeCopy, true)">
+      <html:input class="quickmove-copy-textbox"
+                  onfocus="quickmove.focus(event)"
+                  onkeypress="quickmove.keypress(event, quickmove.executeCopy)"
+                  oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+      <menuseparator class="quickmove-separator"/>
+    </menupopup>
+  `);
+
+  let oldCopyPopup = copyMenu.replaceChild(quickMoveCopyHere, copyMenu.menupopup);
+
+  window.quickmove.cleanup.push(() => {
+    quickMoveFileHere = document.getElementById("quickmove-context-menupopup");
+    quickMoveFileHere.parentNode.replaceChild(oldMovePopup, quickMoveFileHere);
+
+    quickMoveCopyHere = document.getElementById("quickmove-context-copy-menupopup");
+    quickMoveCopyHere.parentNode.replaceChild(oldCopyPopup, quickMoveCopyHere);
+  });
+}
+
+function initFolderLocation(window, document) {
+  let quickmoveLocationPopup = window.MozXULElement.parseXULToFragment(`
+    <menupopup id="quickmove-folderlocation-menupopup"
+               ignorekeys="true"
+               onpopupshowing="quickmove.popupshowing(event)"
+               onpopupshown="quickmove.popupshown(event)"
+               onpopuphidden="quickmove.hide(event.target)"
+               oncommand="quickmove.command(event, quickmove.executeGoto)">
+      <html:input class="quickmove-textbox"
+                  onfocus="quickmove.focus(event)"
+                  onkeypress="quickmove.keypress(event, quickmove.executeGoto)"
+                  oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+      <menuseparator id="quickmove-location-separator" class="quickmove-separator"/>
+    </menupopup>
+  `);
+
+  let palette = document.getElementById("mail-toolbox").palette;
+
+  let folderLocationPopup = document.getElementById("folderLocationPopup") ||
+    palette.querySelector("#folderLocationPopup");
+  folderLocationPopup.setAttribute("hidden", "true");
+
+  let locationFolders = document.getElementById("locationFolders") ||
+    palette.querySelector("#locationFolders");
+  locationFolders.appendChild(quickmoveLocationPopup);
+
+  window.quickmove.cleanup.push(() => {
+    folderLocationPopup = document.getElementById("folderLocationPopup") ||
+      palette.querySelector("#folderLocationPopup");
+    folderLocationPopup.removeAttribute("hidden");
+
+    quickmoveLocationPopup = document.getElementById("quickmove-folderlocation-menupopup") ||
+      palette.querySelector("#quickmove-folderlocation-menupopup");
+    quickmoveLocationPopup.remove();
+  });
+}
+
+function startup(data, reason) {
+  ExtensionSupport.registerWindowListener("quickmove", {
+    chromeURLs: [
+      "chrome://messenger/content/messageWindow.xul",
+      "chrome://messenger/content/messenger.xul"
+    ],
+    onLoadWindow: async function(window) {
+      let document = window.document;
+
+      initScript(window, document);
+      initCSS(window, document);
+      initKeys(window, document);
+
+      initButtonFile(window, document);
+      initContextMenus(window, document);
+
+      if (window.location.href == "chrome://messenger/content/messageWindow.xul") {
+        document.getElementById("quickmove-goto").remove();
+      } else if (window.location.href == "chrome://messenger/content/messenger.xul") {
+        initFolderLocation(window, document);
+      }
+    }
+  });
+}
+
+function shutdown() {
+  ExtensionSupport.unregisterWindowListener("quickmove");
+
+  for (let window of ExtensionSupport.openWindows) {
+    if (window.quickmove && window.quickmove.cleanup) {
+      for (let func of window.quickmove.cleanup.reverse()) {
+        try {
+          func();
+        } catch (e) {
+          Cu.reportError(e);
+        }
+      }
+    }
+  }
+}
+
+function install() {}
+function uninstall() {}
diff --git a/chrome.manifest b/chrome.manifest
index d6779f2..f37463e 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,9 +1 @@
-content	quickmove	        chrome/content/
-locale  quickmove en-US     chrome/locales/en-US/
-locale  quickmove de        chrome/locales/de/
-locale  quickmove uk        chrome/locales/uk/
-locale  quickmove ru        chrome/locales/ru/
-resource quickmove          .
-
-overlay chrome://messenger/content/messenger.xul chrome://quickmove/content/quickmove-overlay.xul
-overlay chrome://messenger/content/messageWindow.xul chrome://quickmove/content/quickmove-overlay.xul
+content quickmove content/
diff --git a/chrome/content/quickmove-overlay.xul b/chrome/content/quickmove-overlay.xul
deleted file mode 100644
index d82fc1f..0000000
--- a/chrome/content/quickmove-overlay.xul
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/.
-   - Portions Copyright (C) Philipp Kewisch, 2009-2014 -->
-
-<!DOCTYPE overlay SYSTEM "chrome://quickmove/locale/quickmove.dtd">
-
-<overlay id="quickmove-overlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript" src="chrome://quickmove/content/quickmove.js"/>
-
-  <menupopup id="folderLocationPopup" hidden="true"/>
-
-  <menu id="mailContext-moveMenu">
-    <menupopup id="quickmove-context-menupopup"
-               ignorekeys="true"
-               insertbefore="mailContext-fileHereMenu"
-               onpopupshowing="quickmove.popupshowing(event)"
-               onpopupshown="quickmove.popupshown(event)"
-               onpopuphidden="quickmove.hide(event.target)"
-               oncommand="quickmove.command(event, quickmove.executeMove, true)">
-      <textbox class="quickmove-textbox"
-               type="search"
-               timeout="500"
-               onfocus="quickmove.focus(event)"
-               onkeypress="quickmove.keypress(event, quickmove.executeMove)"
-               oncommand="quickmove.search(event.target); event.stopPropagation();"/>
-      <menuseparator class="quickmove-separator"/>
-    </menupopup>
-  </menu>
-
-  <menu id="mailContext-copyMenu">
-    <menupopup id="quickmove-context-copy-menupopup"
-               ignorekeys="true"
-               insertbefore="mailContext-copyHereMenu"
-               onpopupshowing="quickmove.popupshowing(event)"
-               onpopupshown="quickmove.popupshown(event)"
-               onpopuphidden="quickmove.hide(event.target)"
-               oncommand="quickmove.command(event, quickmove.executeCopy, true)">
-      <textbox id="quickmove-copy-textbox"
-               type="search"
-               timeout="500"
-               onfocus="quickmove.focus(event)"
-               onkeypress="quickmove.keypress(event, quickmove.executeCopy)"
-               oncommand="quickmove.search(event.target); event.stopPropagation();"/>
-      <menuseparator class="quickmove-separator"/>
-    </menupopup>
-  </menu>
-
-  <toolbarbutton id="button-file">
-    <menupopup id="quickmove-filebutton-menupopup"
-               ignorekeys="true"
-               insertbefore="button-filePopup"
-               onpopupshowing="quickmove.popupshowing(event)"
-               onpopupshown="quickmove.popupshown(event)"
-               onpopuphidden="quickmove.hide(event.target)">
-      <textbox id="quickmove-filebutton-textbox"
-               type="search"
-               timeout="500"
-               onfocus="quickmove.focus(event)"
-               onkeypress="quickmove.keypress(event, quickmove.executeMove)"
-               oncommand="quickmove.search(event.target); event.stopPropagation();"/>
-      <menuseparator id="quickmove-filebutton-separator" class="quickmove-separator"/>
-    </menupopup>
-  </toolbarbutton>
-
-
-  <popupset id="mainPopupSet">
-    <menupopup id="quickmove-menupopup"
-           ignorekeys="true"
-           onpopupshowing="quickmove.popupshowing(event)"
-           onpopupshown="quickmove.popupshown(event)"
-           onpopuphidden="quickmove.hide(event.target)"
-           oncommand="quickmove.command(event, quickmove.executeMove)">
-      <textbox class="quickmove-textbox"
-               type="search"
-               timeout="500"
-               onfocus="quickmove.focus(event)"
-               onkeypress="quickmove.keypress(event, quickmove.executeMove)"
-               oncommand="quickmove.search(event.target); event.stopPropagation();"/>
-      <menuseparator class="quickmove-separator"/>
-    </menupopup>
-    <menupopup id="quickmove-goto-menupopup"
-               ignorekeys="true"
-               onpopupshowing="quickmove.popupshowing(event)"
-               onpopupshown="quickmove.popupshown(event)"
-               onpopuphidden="quickmove.hide(event.target)"
-               oncommand="quickmove.command(event, quickmove.executeGoto)">
-      <textbox class="quickmove-textbox"
-               type="search"
-               timeout="500"
-               onfocus="quickmove.focus(event)"
-               onkeypress="quickmove.keypress(event, quickmove.executeGoto)"
-               oncommand="quickmove.search(event.target); event.stopPropagation();"/>
-      <menuseparator id="quickmove-goto-separator" class="quickmove-separator"/>
-    </menupopup>
-    <menupopup id="quickmove-copy-menupopup"
-               ignorekeys="true"
-               onpopupshowing="quickmove.popupshowing(event)"
-               onpopupshown="quickmove.popupshown(event)"
-               onpopuphidden="quickmove.hide(event.target)"
-               oncommand="quickmove.command(event, quickmove.executeCopy)">
-      <textbox class="quickmove-textbox"
-               type="search"
-               timeout="500"
-               onfocus="quickmove.focus(event)"
-               onkeypress="quickmove.keypress(event, quickmove.executeCopy)"
-               oncommand="quickmove.search(event.target); event.stopPropagation();"/>
-      <menuseparator id="quickmove-copy-separator" class="quickmove-separator"/>
-    </menupopup>
-  </popupset>
-
-  <window id="messengerWindow">
-    <menupopup id="quickmove-compose-menupopup"
-           ignorekeys="true"
-           onpopupshowing="quickmove.popupshowing(event)"
-           onpopupshown="quickmove.popupshown(event)"
-           onpopuphidden="quickmove.hide(event.target)"
-           oncommand="quickmove.command(event, quickmove.executeMove)">
-      <textbox class="quickmove-textbox"
-               type="search"
-               timeout="500"
-               onfocus="quickmove.focus(event)"
-               onkeypress="quickmove.keypress(event, quickmove.executeMove)"
-               oncommand="quickmove.search(event.target); event.stopPropagation();"/>
-      <menuseparator class="quickmove-separator"/>
-    </menupopup>
-    <menupopup id="quickmove-compose-copy-menupopup"
-           ignorekeys="true"
-           onpopupshowing="quickmove.popupshowing(event)"
-           onpopupshown="quickmove.popupshown(event)"
-           onpopuphidden="quickmove.hide(event.target)"
-           oncommand="quickmove.command(event, quickmove.executeCopy)">
-      <textbox class="quickmove-textbox"
-               type="search"
-               timeout="500"
-               onfocus="quickmove.focus(event)"
-               onkeypress="quickmove.keypress(event, quickmove.executeCopy)"
-               oncommand="quickmove.search(event.target); event.stopPropagation();"/>
-      <menuseparator class="quickmove-separator"/>
-    </menupopup>
-  </window>
-
-
-  <menulist id="locationFolders">
-    <menupopup id="quickmove-folderlocation-menupopup"
-               insertbefore="folderLocationPopup"
-               ignorekeys="true"
-               onpopupshowing="quickmove.popupshowing(event)"
-               onpopupshown="quickmove.popupshown(event)"
-               onpopuphidden="quickmove.hide(event.target)"
-               oncommand="quickmove.command(event, quickmove.executeGoto)">
-      <textbox class="quickmove-textbox"
-               type="search"
-               timeout="500"
-               onfocus="quickmove.focus(event)"
-               onkeypress="quickmove.keypress(event, quickmove.executeGoto)"
-               oncommand="quickmove.search(event.target); event.stopPropagation();"/>
-      <menuseparator id="quickmove-location-separator" class="quickmove-separator"/>
-    </menupopup>
-  </menulist>
-
-  <menupopup id="mailContext-fileHereMenu" hidden="true" removeelement="true"/>
-  <menupopup id="mailContext-copyHereMenu" hidden="true" removeelement="true"/>
-  <menupopup id="button-filePopup" hidden="true" removeelement="true"/>
-
-  <keyset id="mailKeys">
-    <key id="quickmove-file" key="&quickmove.keyboard.file.key;" modifiers="&quickmove.keyboard.file.modifiers;" oncommand="quickmove.openFile()"/>
-    <key id="quickmove-goto" key="&quickmove.keyboard.goto.key;" modifiers="&quickmove.keyboard.goto.modifiers;" oncommand="quickmove.openGoto()"/>
-    <key id="quickmove-copy" key="&quickmove.keyboard.copy.key;" modifiers="&quickmove.keyboard.copy.modifiers;" oncommand="quickmove.openCopy()"/>
-  </keyset>
-</overlay>
diff --git a/chrome/content/quickmove.js b/chrome/content/quickmove.js
deleted file mode 100644
index dedaa0d..0000000
--- a/chrome/content/quickmove.js
+++ /dev/null
@@ -1,407 +0,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/.
- * Portions Copyright (C) Philipp Kewisch, 2009-2013 */
-
-"use strict";
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-Components.utils.import("resource:///modules/gloda/suffixtree.js");
-Components.utils.import("resource:///modules/iteratorUtils.jsm");
-Components.utils.import("resource:///modules/mailServices.js");
-
-Components.utils.import("resource://quickmove/modules/Quickmove.jsm");
-
-var quickmove = {
-  /** An array of recent folders, to be shown when no search term is entered */
-  recentFolders: [],
-
-  /** A gloda suffix tree to provide quick search access to the folders */
-  suffixTree: null,
-
-  /** True when something was typed but the search has not completed */
-  dirty: false,
-
-  /** Function to call when the seach completes. Used by the dirty logic */
-  searchCompleteFunc: null,
-
-  /** Element last focused when the popup was initiated */
-  initiator: null,
-
-  /**
-   * Event listener method to be called when the 'move to' or 'copy to'
-   * context menu is shown.
-   */
-  popupshowing: function(event) {
-    if (event.target.getAttribute("ignorekeys") != "true") {
-      // If we are showing the menuitems, then don't set up the folders but
-      // keep the old list.
-      return;
-    }
-
-    let focusedElement = document.commandDispatcher.focusedElement;
-    if (focusedElement && focusedElement.id) {
-      quickmove.initiator = document.commandDispatcher.focusedElement;
-    }
-    Quickmove.clearItems(event.target);
-    quickmove.prepareFolders();
-
-    let initialText = "";
-    if (typeof GetMessagePaneFrame != "undefined") {
-      let selection = GetMessagePaneFrame().getSelection() || "";
-      initialText = selection.toString() || "";
-    }
-
-    event.target.firstChild.value = initialText;
-    quickmove.dirty = false;
-    if (initialText) {
-      quickmove.search(event.target.firstChild);
-    } else {
-      quickmove.addFolders(quickmove.recentFolders, event.target, event.target.firstChild.value);
-    }
-    event.stopPropagation();
-  },
-
-  popupshown: function(event) {
-    // focus the textbox
-    event.target.setAttribute("ignorekeys", "true");
-    event.target.firstChild.focus();
-  },
-
-  /**
-   * Add a set of folders to the context menu.
-   *
-   * @param folders     An array of folders to add
-   * @param popup       The popup to add to
-   * @param targetValue The searched text
-   */
-  addFolders: function(folders, popup, targetValue) {
-    let dupeMap = {};
-    let serverMap = {};
-    let fullPathMap = {};
-
-    // First create a map of pretty names to find possible duplicates.
-    for (let folder of folders) {
-      let lowerName = folder.prettyName.toLowerCase();
-      let serverLowerName = folder.server.prettyName.toLowerCase();
-
-      if (!(lowerName in serverMap)) {
-        serverMap[lowerName] = {};
-      }
-
-      if (!(lowerName in dupeMap)) {
-        dupeMap[lowerName] = 0;
-        serverMap[lowerName][serverLowerName] = 0;
-      }
-
-      if (lowerName in serverMap &&
-            serverLowerName in serverMap[lowerName] &&
-            serverMap[lowerName][serverLowerName]) {
-        // Already in the server map, this folder needs the full path
-        fullPathMap[lowerName] = true;
-      }
-
-      serverMap[lowerName][serverLowerName] = true;
-      dupeMap[lowerName]++;
-    }
-
-    // Now add each folder, appending the server name if the folder name
-    // itself would appear more than once.
-    for (let folder of folders) {
-      let node = document.createElement("menuitem");
-      let label = folder.prettyName;
-      let lowerLabel = label.toLowerCase();
-
-      if (lowerLabel in fullPathMap) {
-        label = Quickmove.getFullName(folder);
-      }
-
-      if ((lowerLabel in dupeMap) && dupeMap[lowerLabel] > 1) {
-        label += " - " + folder.server.prettyName;
-      }
-      node.setAttribute("label", label);
-      node._folder = folder;
-
-      node.setAttribute("class", "folderMenuItem menuitem-iconic");
-      if (lowerLabel == targetValue.toLowerCase()) {
-        // An exact match, put this at the top after the separator
-        let separator = popup.getElementsByClassName("quickmove-separator")[0];
-        popup.insertBefore(node, separator.nextSibling);
-      } else {
-        // Otherwise append to the end
-        popup.appendChild(node);
-      }
-    }
-  },
-
-  /**
-   * Prepare the recent folders and the suffix tree with all available folders.
-   */
-  prepareFolders: function() {
-    function sorter(a, b) {
-      let atime = Number(a.getStringProperty("MRUTime")) || 0;
-      let btime = Number(b.getStringProperty("MRUTime")) || 0;
-      return atime < btime;
-    }
-
-    /**
-     * This function will iterate through any existing sub-folders and
-     * (1) check if they're recent and (2) recursively call this function
-     * to iterate through any sub-sub-folders.
-     *
-     * @param aFolder  the folder to check
-     */
-    function processFolder(aFolder) {
-      addIfRecent(aFolder);
-      allFolders.push(aFolder);
-      allNames.push(aFolder.prettyName.toLowerCase());
-
-      if (aFolder.hasSubFolders) {
-        let myenum = aFolder.subFolders;
-        while (myenum.hasMoreElements()) {
-          processFolder(myenum.getNext().QueryInterface(Components.interfaces.nsIMsgFolder));
-        }
-      }
-    }
-
-    function addIfRecent(aFolder) {
-      if (!aFolder.canFileMessages) {
-        return;
-      }
-
-      let time = 0;
-      try {
-        time = Number(aFolder.getStringProperty("MRUTime")) || 0;
-      } catch (ex) {
-        // If MRUTime is NaN, assume 0
-      }
-
-      if (time <= oldestTime) {
-        return;
-      }
-
-      if (recentFolders.length == maxRecent) {
-        recentFolders.sort(sorter);
-        recentFolders.pop();
-        oldestTime = Number(recentFolders[recentFolders.length-1].getStringProperty("MRUTime")) || 0;
-      }
-      recentFolders.push(aFolder);
-    }
-
-    let allFolders = [];
-    let allNames = [];
-    let recentFolders = quickmove.recentFolders = [];
-    let oldestTime = 0;
-
-    let maxRecent = Services.prefs.getIntPref("extensions.quickmove.maxRecentFolders", 15);
-
-    for (let acct of fixIterator(MailServices.accounts.accounts, Components.interfaces.nsIMsgAccount)) {
-      if (acct.incomingServer) {
-        processFolder(acct.incomingServer.rootFolder);
-      }
-    }
-
-    quickmove.suffixTree = new MultiSuffixTree(allNames, allFolders);
-
-    recentFolders.sort(sorter);
-  },
-
-  /**
-   * Perform a search. If no search term is entered, the recent folders are
-   * shown, otherwise folders which match the search term are shown.
-   */
-  search: function(textboxNode) {
-    let popup = textboxNode.parentNode;
-    Quickmove.clearItems(popup);
-    if (textboxNode.value.length == 0) {
-      quickmove.addFolders(quickmove.recentFolders, popup, textboxNode.value);
-    } else {
-      let folders = quickmove.suffixTree
-        .findMatches(textboxNode.value.toLowerCase())
-        .filter(x => x.canFileMessages);
-      if (folders.length) {
-        quickmove.addFolders(folders, popup, textboxNode.value);
-      } else {
-        let node = document.createElement("menuitem");
-        node.setAttribute("disabled", "true");
-        node.style.textAlign = "center";
-        node.setAttribute("label", Quickmove.getString("noResults"));
-        popup.appendChild(node);
-      }
-    }
-
-    // The search is done, reset the dirty count and call the search complete
-    // func if it is defined.
-    quickmove.dirty = false;
-    if (quickmove.searchCompleteFunc) {
-      quickmove.searchCompleteFunc();
-      quickmove.searchCompleteFunc = null;
-    }
-  },
-
-  executeCopy: function(folder) {
-    quickmove.executeMove(folder, true);
-  },
-
-  executeMove: function(folder, copyNotMove) {
-    if (copyNotMove) {
-      MsgCopyMessage(folder);
-    } else {
-      if (Services.prefs.getBoolPref("extensions.quickmove.markAsRead", true)) {
-        MsgMarkMsgAsRead(true);
-      }
-      MsgMoveMessage(folder);
-    }
-  },
-
-  executeGoto: function(folder) {
-    gFolderTreeView.selectFolder(folder, true);
-  },
-
-  focus: function(event) {
-    let popup = event.target.parentNode;
-    popup.setAttribute("ignorekeys", "true");
-  },
-
-  keypress: function(event, executeFunc) {
-    let popup = event.target.parentNode;
-
-    // Executor function used later to execute the actual action
-    function executor() {
-      let firstFolder = event.target.nextSibling &&
-                        event.target.nextSibling.nextSibling &&
-                        event.target.nextSibling.nextSibling._folder;
-      if (firstFolder) {
-        executeFunc(firstFolder);
-      }
-    }
-
-    // Now check which key was pressed
-    if (event.keyCode == event.DOM_VK_ESCAPE) {
-      // On escape, cancel and close the popup.
-      quickmove.hide(popup);
-    } else if (event.keyCode == event.DOM_VK_RETURN) {
-      // If the user presses enter, execute the passed action, either directly
-      // or indirectly
-      if (quickmove.dirty) {
-        // We haven't finished searching for folders, wait until the search
-        // completes and then move.
-        quickmove.searchCompleteFunc = executor;
-      } else {
-        // Otherwise go ahead and do so directly.
-        executor();
-      }
-
-      // Now hide the popup
-      quickmove.hide(popup);
-    } else if (event.keyCode == event.DOM_VK_DOWN && !popup.lastChild.disabled) {
-      popup.removeAttribute("ignorekeys");
-      popup.firstChild.blur();
-
-      // Synthesize another keydown/up cycle, this ensures the first menuitem
-      // is actually focused.
-      let keyEvent = document.createEvent("KeyboardEvent");
-      keyEvent.initKeyEvent("keydown", true, true, null, false, false,
-        false, false, keyEvent.DOM_VK_DOWN, 0);
-      popup.dispatchEvent(keyEvent);
-      keyEvent.initKeyEvent("keyup", true, true, null, false, false,
-        false, false, keyEvent.DOM_VK_DOWN, 0);
-      popup.dispatchEvent(keyEvent);
-    } else {
-      // If something was typed, then remember that we haven't searched yet.
-      quickmove.dirty = true;
-
-      // Don't stop propagation for normal keypresses.
-      return;
-    }
-    event.stopPropagation();
-    event.preventDefault();
-  },
-
-  command: function(event, executeFunc, isContext=false) {
-    let popup = event.target.parentNode;
-    executeFunc(event.target._folder);
-    event.stopPropagation();
-    quickmove.hide(popup, isContext);
-  },
-
-  openFile: function() {
-    let filebutton = document.getElementById("button-file");
-    let threadTree = document.getElementById("threadTree");
-    let messagepane = document.getElementById("messagepane");
-    if (filebutton) {
-      // There is a file button, open its popup
-      let filepopup = document.getElementById("quickmove-filebutton-menupopup");
-      filepopup.openPopup(filebutton, "after_start");
-    } else if (threadTree) {
-      // If there is a thread tree (i.e mail 3pane), then use it
-      let filepopup = document.getElementById("quickmove-menupopup");
-      let threadTreeCols = document.getElementById("threadCols");
-      let treeBO = threadTree.treeBoxObject;
-      let selection = threadTree.view.selection;
-      let rowOffset = treeBO.rowHeight *
-                    (selection.currentIndex - treeBO.getFirstVisibleRow() + 1) +
-                    threadTreeCols.boxObject.height;
-      filepopup.openPopup(threadTree, "overlap", 0, rowOffset);
-    } else if (messagepane) {
-      let filepopup = document.getElementById("quickmove-compose-menupopup");
-      filepopup.openPopup(messagepane, "overlap");
-    } else {
-      Components.utils.reportError("Couldn't find a node to open the panel on");
-    }
-  },
-
-  openGoto: function() {
-    let folderLocation = document.getElementById("folder-location-container");
-    let folderTree = document.getElementById("folderTree");
-
-    if (folderLocation) {
-      // There is a folder location popup, open its popup
-      let menulist = folderLocation.firstChild;
-      menulist.menupopup.openPopup(menulist);
-    } else if (folderTree) {
-      let popup = document.getElementById("quickmove-goto-menupopup");
-      popup.openPopup(folderTree, "overlap");
-    }
-  },
-
-  openCopy: function() {
-    let threadTree = document.getElementById("threadTree");
-    let messagepane = document.getElementById("messagepane");
-    if (threadTree) {
-      // If there is a thread tree (i.e mail 3pane), then use it
-      let filepopup = document.getElementById("quickmove-copy-menupopup");
-      let threadTreeCols = document.getElementById("threadCols");
-      let treeBO = threadTree.treeBoxObject;
-      let selection = threadTree.view.selection;
-      let rowOffset = treeBO.rowHeight *
-                    (selection.currentIndex - treeBO.getFirstVisibleRow() + 1) +
-                    threadTreeCols.boxObject.height;
-      filepopup.openPopup(threadTree, "overlap", 0, rowOffset);
-    } else if (messagepane) {
-      let filepopup = document.getElementById("quickmove-compose-copy-menupopup");
-      filepopup.openPopup(messagepane, "overlap");
-    } else {
-      Components.utils.reportError("Couldn't find a node to open the panel on");
-    }
-  },
-
-  hide: function(popup, isContext=false) {
-    if (!isContext) {
-      popup.hidePopup();
-    }
-
-    // Hiding the menupopup should clear the search text and reset ignorekeys
-    // to be able to use the textbox.
-    popup.firstChild.value = "";
-    popup.setAttribute("ignorekeys", "true");
-
-    // Now reference the previous node, so the user can continue filing or
-    // searching
-    if (quickmove.initiator) {
-      quickmove.initiator.focus();
-      quickmove.initiator = null;
-    }
-  }
-};
diff --git a/chrome/locales/de/quickmove.dtd b/chrome/locales/de/quickmove.dtd
deleted file mode 100644
index ff78fc4..0000000
--- a/chrome/locales/de/quickmove.dtd
+++ /dev/null
@@ -1,11 +0,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/.
-   - Portions Copyright (C) Philipp Kewisch, 2010 -->
-
-<!ENTITY quickmove.keyboard.file.key                       "m">
-<!ENTITY quickmove.keyboard.file.modifiers                 "shift">
-<!ENTITY quickmove.keyboard.goto.key                       "g">
-<!ENTITY quickmove.keyboard.goto.modifiers                 "shift">
-<!ENTITY quickmove.keyboard.copy.key                       "y">
-<!ENTITY quickmove.keyboard.copy.modifiers                 "shift">
diff --git a/chrome/locales/de/quickmove.properties b/chrome/locales/de/quickmove.properties
deleted file mode 100644
index f0ba957..0000000
--- a/chrome/locales/de/quickmove.properties
+++ /dev/null
@@ -1,6 +0,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/.
-# Portions Copyright (C) Philipp Kewisch, 2009
-
-noResults=<Keine Ergebnisse>
diff --git a/chrome/locales/en-US/amo.properties b/chrome/locales/en-US/amo.properties
deleted file mode 100644
index 8804bf1..0000000
--- a/chrome/locales/en-US/amo.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-[name]
-Quick Folder Move
-
-[shortdesc]
-When filing messages, you can use the keyboard shortcuts to quickly search for the folder to move the message to. The long description has info on how to use the extension. If no search term is entered, a list of recent folders will show up instead.
-
-[longdesc]
-Use the keyboard to quickly move messages and navigate folders. First of all, use one of the following keyboard shortcuts:
-<ul>
-  <li><b>Shift+M</b> opens a context menu that allows you to move the currently selected messages</li>
-  <li><b>Shift+G</b> opens a context menu that allows you to navigate to the folder you've entered</li>
-</ul>
-Then enter parts of the folder you want to move the message to. Pressing Enter will move the message to the first entry in the search results. If you'd rather use the context menus, the Move To/Copy To context menus have also been modified to use the quick folder move menu.
-
-<b>KNOWN ISSUES</b>
-Using Shift+G to open a folder not shown in the view uses a Thunderbird native function to select the folder. This function changes to the default view (all folders) if the folder is not visible (i.e contains no unread messages).
diff --git a/chrome/locales/en-US/quickmove.dtd b/chrome/locales/en-US/quickmove.dtd
deleted file mode 100644
index ff78fc4..0000000
--- a/chrome/locales/en-US/quickmove.dtd
+++ /dev/null
@@ -1,11 +0,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/.
-   - Portions Copyright (C) Philipp Kewisch, 2010 -->
-
-<!ENTITY quickmove.keyboard.file.key                       "m">
-<!ENTITY quickmove.keyboard.file.modifiers                 "shift">
-<!ENTITY quickmove.keyboard.goto.key                       "g">
-<!ENTITY quickmove.keyboard.goto.modifiers                 "shift">
-<!ENTITY quickmove.keyboard.copy.key                       "y">
-<!ENTITY quickmove.keyboard.copy.modifiers                 "shift">
diff --git a/chrome/locales/en-US/quickmove.properties b/chrome/locales/en-US/quickmove.properties
deleted file mode 100644
index 9d3eaf2..0000000
--- a/chrome/locales/en-US/quickmove.properties
+++ /dev/null
@@ -1,6 +0,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/.
-# Portions Copyright (C) Philipp Kewisch, 2009
-
-noResults=<No Results>
diff --git a/chrome/locales/ru/quickmove.dtd b/chrome/locales/ru/quickmove.dtd
deleted file mode 100644
index 361c4bf..0000000
--- a/chrome/locales/ru/quickmove.dtd
+++ /dev/null
@@ -1,10 +0,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/. -->
-
-<!ENTITY quickmove.keyboard.file.key                       "п">
-<!ENTITY quickmove.keyboard.file.modifiers                 "shift">
-<!ENTITY quickmove.keyboard.goto.key                       "и">
-<!ENTITY quickmove.keyboard.goto.modifiers                 "shift">
-<!ENTITY quickmove.keyboard.copy.key                       "y">
-<!ENTITY quickmove.keyboard.copy.modifiers                 "shift">
diff --git a/chrome/locales/ru/quickmove.properties b/chrome/locales/ru/quickmove.properties
deleted file mode 100644
index a299b46..0000000
--- a/chrome/locales/ru/quickmove.properties
+++ /dev/null
@@ -1,5 +0,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/.
-
-noResults=<Результаты отсутствуют>
diff --git a/chrome/locales/uk/quickmove.dtd b/chrome/locales/uk/quickmove.dtd
deleted file mode 100644
index 90b1975..0000000
--- a/chrome/locales/uk/quickmove.dtd
+++ /dev/null
@@ -1,10 +0,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/. -->
-
-<!ENTITY quickmove.keyboard.file.key                       "п">
-<!ENTITY quickmove.keyboard.file.modifiers                 "shift">
-<!ENTITY quickmove.keyboard.goto.key                       "і">
-<!ENTITY quickmove.keyboard.goto.modifiers                 "shift">
-<!ENTITY quickmove.keyboard.copy.key                       "y">
-<!ENTITY quickmove.keyboard.copy.modifiers                 "shift">
diff --git a/chrome/locales/uk/quickmove.properties b/chrome/locales/uk/quickmove.properties
deleted file mode 100644
index fd06d16..0000000
--- a/chrome/locales/uk/quickmove.properties
+++ /dev/null
@@ -1,5 +0,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/.
-
-noResults=<Результати відсутні>
diff --git a/content/addon.png b/content/addon.png
new file mode 100644
index 0000000..3a8217c
Binary files /dev/null and b/content/addon.png differ
diff --git a/content/quickmove.css b/content/quickmove.css
new file mode 100644
index 0000000..c3061bd
--- /dev/null
+++ b/content/quickmove.css
@@ -0,0 +1,8 @@
+/* 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/.
+ * Portions Copyright (C) Philipp Kewisch, 2019 */
+
+.quickmove-textbox {
+  margin: 1px 5px 0px;
+}
diff --git a/content/quickmove.js b/content/quickmove.js
new file mode 100644
index 0000000..24a7414
--- /dev/null
+++ b/content/quickmove.js
@@ -0,0 +1,505 @@
+/* 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/.
+ * Portions Copyright (C) Philipp Kewisch, 2009-2019 */
+
+"use strict";
+
+var quickmove = (function() {
+  const ADDON_ID = "quickmove@mozilla.kewis.ch";
+
+  var { MultiSuffixTree } = ChromeUtils.import("resource:///modules/gloda/suffixtree.js");
+  var { ExtensionParent } = ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
+
+  var Quickmove = {
+    getWXAPI(name, sync=false) {
+      function implementation(api) {
+        let impl = api.getAPI({ extension })[name];
+
+        if (name == "storage") {
+          impl.local.get = (...args) => impl.local.callMethodInParentProcess("get", args);
+          impl.local.set = (...args) => impl.local.callMethodInParentProcess("set", args);
+          impl.local.remove = (...args) => impl.local.callMethodInParentProcess("remove", args);
+          impl.local.clear = (...args) => impl.local.callMethodInParentProcess("clear", args);
+        }
+        return impl;
+      }
+
+      let extension = ExtensionParent.GlobalManager.getExtension(ADDON_ID);
+      if (sync) {
+        let api = extension.apiManager.getAPI(name, extension, "addon_parent");
+        return implementation(api);
+      } else {
+        return extension.apiManager.asyncGetAPI(name, extension, "addon_parent").then((api) => {
+          return implementation(api);
+        });
+      }
+    },
+
+    getString: function(aName) {
+      return this.getWXAPI("i18n", true).getMessage(aName);
+    },
+
+    getFullName: function(aFolder) {
+      let folder = aFolder;
+      let fullPath = [];
+
+      while (folder && folder.parent) {
+        fullPath.unshift(folder.prettyName);
+        folder = folder.parent;
+      }
+
+      return fullPath.join("/");
+    },
+
+    /**
+     * Clear all items except the menuseparator and the search box
+     */
+    clearItems: function(popup) {
+      while (popup.lastChild.className != "quickmove-separator") {
+        popup.removeChild(popup.lastChild);
+      }
+    },
+
+    getPref: async function(name, defaultValue=null) {
+      let storage = await this.getWXAPI("storage");
+      let prefs = await storage.local.get({ [name]: defaultValue });
+
+      return prefs[name];
+    },
+
+    migrateStorage: async function() {
+      let storage = await this.getWXAPI("storage");
+
+      await storage.local.set({
+        maxRecentFolders: Services.prefs.getIntPref("extensions.quickmove.maxRecentFolders", 15),
+        markAsRead: Services.prefs.getBoolPref("extensions.quickmove.markAsRead", true)
+      });
+
+      Services.prefs.clearUserPref("extensions.quickmove.maxRecentFolders");
+      Services.prefs.clearUserPref("extensions.quickmove.markAsRead");
+    },
+
+    debounce: function(func, wait, immediate) {
+      // https://davidwalsh.name/javascript-debounce-function (MIT license from underscore)
+      // Some adaptions to be more ES6-like and satisfy eslint
+      let timeout;
+      return function(...args) {
+        let callNow = immediate && !timeout;
+        clearTimeout(timeout);
+
+        timeout = setTimeout(() => {
+          timeout = null;
+          if (!immediate) {
+            func.apply(this, args);
+          }
+        }, wait);
+
+        if (callNow) {
+          func.apply(this, args);
+        }
+      };
+      // End MIT license code
+    },
+  };
+
+  return {
+    /** Cleanup functions for this window **/
+    cleanup: [],
+
+    /** An array of recent folders, to be shown when no search term is entered */
+    recentFolders: [],
+
+    /** A gloda suffix tree to provide quick search access to the folders */
+    suffixTree: null,
+
+    /** True when something was typed but the search has not completed */
+    dirty: false,
+
+    /** Function to call when the seach completes. Used by the dirty logic */
+    searchCompleteFunc: null,
+
+    /** Element last focused when the popup was initiated */
+    initiator: null,
+
+
+    /**
+     * Event listener method to be called when the 'move to' or 'copy to'
+     * context menu is shown.
+     */
+    popupshowing: function(event) {
+      if (event.target.getAttribute("ignorekeys") != "true") {
+        // If we are showing the menuitems, then don't set up the folders but
+        // keep the old list.
+        return;
+      }
+
+      let focusedElement = document.commandDispatcher.focusedElement;
+      if (focusedElement && focusedElement.id) {
+        quickmove.initiator = document.commandDispatcher.focusedElement;
+      }
+      Quickmove.clearItems(event.target);
+      quickmove.prepareFolders().then(() => {
+        let initialText = "";
+        if (typeof GetMessagePaneFrame != "undefined") {
+          let selection = GetMessagePaneFrame().getSelection() || "";
+          initialText = selection.toString() || "";
+        }
+
+        event.target.firstChild.value = initialText;
+        quickmove.dirty = false;
+        if (initialText) {
+          quickmove.search(event.target.firstChild);
+        } else {
+          quickmove.addFolders(quickmove.recentFolders, event.target, event.target.firstChild.value);
+        }
+      });
+      event.stopPropagation();
+    },
+
+    popupshown: function(event) {
+      // focus the textbox
+      event.target.setAttribute("ignorekeys", "true");
+      event.target.firstChild.focus();
+    },
+
+    /**
+     * Add a set of folders to the context menu.
+     *
+     * @param folders     An array of folders to add
+     * @param popup       The popup to add to
+     * @param targetValue The searched text
+     */
+    addFolders: function(folders, popup, targetValue) {
+      let dupeMap = {};
+      let serverMap = {};
+      let fullPathMap = {};
+
+      // First create a map of pretty names to find possible duplicates.
+      for (let folder of folders) {
+        let lowerName = folder.prettyName.toLowerCase();
+        let serverLowerName = folder.server.prettyName.toLowerCase();
+
+        if (!(lowerName in serverMap)) {
+          serverMap[lowerName] = {};
+        }
+
+        if (!(lowerName in dupeMap)) {
+          dupeMap[lowerName] = 0;
+          serverMap[lowerName][serverLowerName] = 0;
+        }
+
+        if (lowerName in serverMap &&
+              serverLowerName in serverMap[lowerName] &&
+              serverMap[lowerName][serverLowerName]) {
+          // Already in the server map, this folder needs the full path
+          fullPathMap[lowerName] = true;
+        }
+
+        serverMap[lowerName][serverLowerName] = true;
+        dupeMap[lowerName]++;
+      }
+
+      // Now add each folder, appending the server name if the folder name
+      // itself would appear more than once.
+      for (let folder of folders) {
+        let node = document.createXULElement("menuitem");
+        let label = folder.prettyName;
+        let lowerLabel = label.toLowerCase();
+
+        if (lowerLabel in fullPathMap) {
+          label = Quickmove.getFullName(folder);
+        }
+
+        if ((lowerLabel in dupeMap) && dupeMap[lowerLabel] > 1) {
+          label += " - " + folder.server.prettyName;
+        }
+        node.setAttribute("label", label);
+        node._folder = folder;
+
+        node.setAttribute("class", "folderMenuItem menuitem-iconic");
+        if (lowerLabel == targetValue.toLowerCase()) {
+          // An exact match, put this at the top after the separator
+          let separator = popup.getElementsByClassName("quickmove-separator")[0];
+          popup.insertBefore(node, separator.nextSibling);
+        } else {
+          // Otherwise append to the end
+          popup.appendChild(node);
+        }
+      }
+    },
+
+    /**
+     * Prepare the recent folders and the suffix tree with all available folders.
+     */
+    prepareFolders: async function() {
+      function sorter(a, b) {
+        let atime = Number(a.getStringProperty("MRUTime")) || 0;
+        let btime = Number(b.getStringProperty("MRUTime")) || 0;
+        return atime < btime;
+      }
+
+      /**
+       * This function will iterate through any existing sub-folders and
+       * (1) check if they're recent and (2) recursively call this function
+       * to iterate through any sub-sub-folders.
+       *
+       * @param aFolder  the folder to check
+       */
+      function processFolder(aFolder) {
+        addIfRecent(aFolder);
+        allFolders.push(aFolder);
+        allNames.push(aFolder.prettyName.toLowerCase());
+
+        if (aFolder.hasSubFolders) {
+          let myenum = aFolder.subFolders;
+          while (myenum.hasMoreElements()) {
+            processFolder(myenum.getNext().QueryInterface(Components.interfaces.nsIMsgFolder));
+          }
+        }
+      }
+
+      function addIfRecent(aFolder) {
+        if (!aFolder.canFileMessages) {
+          return;
+        }
+
+        let time = 0;
+        try {
+          time = Number(aFolder.getStringProperty("MRUTime")) || 0;
+        } catch (ex) {
+          // If MRUTime is NaN, assume 0
+        }
+
+        if (time <= oldestTime) {
+          return;
+        }
+
+        if (recentFolders.length == maxRecent) {
+          recentFolders.sort(sorter);
+          recentFolders.pop();
+          oldestTime = Number(recentFolders[recentFolders.length-1].getStringProperty("MRUTime")) || 0;
+        }
+        recentFolders.push(aFolder);
+      }
+
+      let allFolders = [];
+      let allNames = [];
+      let recentFolders = quickmove.recentFolders = [];
+      let oldestTime = 0;
+
+      let maxRecent = await Quickmove.getPref("maxRecentFolders", 15);
+
+      for (let acct of fixIterator(MailServices.accounts.accounts, Components.interfaces.nsIMsgAccount)) {
+        if (acct.incomingServer) {
+          processFolder(acct.incomingServer.rootFolder);
+        }
+      }
+
+      quickmove.suffixTree = new MultiSuffixTree(allNames, allFolders);
+
+      recentFolders.sort(sorter);
+    },
+
+    /**
+     * Perform a search. If no search term is entered, the recent folders are
+     * shown, otherwise folders which match the search term are shown.
+     */
+    search: function(textboxNode) {
+      let popup = textboxNode.parentNode;
+      Quickmove.clearItems(popup);
+      dump(`=== text |${textboxNode.value}|\n`);
+      if (textboxNode.value.length == 0) {
+        quickmove.addFolders(quickmove.recentFolders, popup, textboxNode.value);
+      } else {
+        let folders = quickmove.suffixTree
+          .findMatches(textboxNode.value.toLowerCase())
+          .filter(x => x.canFileMessages);
+        if (folders.length) {
+          quickmove.addFolders(folders, popup, textboxNode.value);
+        } else {
+          let node = document.createXULElement("menuitem");
+          node.setAttribute("disabled", "true");
+          node.style.textAlign = "center";
+          node.setAttribute("label", Quickmove.getString("noResults"));
+          popup.appendChild(node);
+        }
+      }
+
+      // The search is done, reset the dirty count and call the search complete
+      // func if it is defined.
+      quickmove.dirty = false;
+      if (quickmove.searchCompleteFunc) {
+        quickmove.searchCompleteFunc();
+        quickmove.searchCompleteFunc = null;
+      }
+    },
+
+    searchDelayed: Quickmove.debounce((textboxNode) => {
+      quickmove.search(textboxNode);
+    }, 500),
+
+    executeCopy: function(folder) {
+      quickmove.executeMove(folder, true);
+    },
+
+    executeMove: async function(folder, copyNotMove) {
+      if (copyNotMove) {
+        MsgCopyMessage(folder);
+      } else {
+        if (await Quickmove.getPref("markAsRead", true)) {
+          MsgMarkMsgAsRead(true);
+        }
+        MsgMoveMessage(folder);
+      }
+    },
+
+    executeGoto: function(folder) {
+      gFolderTreeView.selectFolder(folder, true);
+    },
+
+    focus: function(event) {
+      let popup = event.target.parentNode;
+      popup.setAttribute("ignorekeys", "true");
+    },
+
+    keypress: function(event, executeFunc) {
+      let popup = event.target.parentNode;
+
+      // Executor function used later to execute the actual action
+      function executor() {
+        let firstFolder = event.target.nextSibling &&
+                          event.target.nextSibling.nextSibling &&
+                          event.target.nextSibling.nextSibling._folder;
+        if (firstFolder) {
+          executeFunc(firstFolder);
+        }
+      }
+
+      // Now check which key was pressed
+      if (event.keyCode == event.DOM_VK_ESCAPE) {
+        // On escape, cancel and close the popup.
+        quickmove.hide(popup);
+      } else if (event.keyCode == event.DOM_VK_RETURN) {
+        // If the user presses enter, execute the passed action, either directly
+        // or indirectly
+        if (quickmove.dirty) {
+          // We haven't finished searching for folders, wait until the search
+          // completes and then move.
+          quickmove.searchCompleteFunc = executor;
+        } else {
+          // Otherwise go ahead and do so directly.
+          executor();
+        }
+
+        // Now hide the popup
+        quickmove.hide(popup);
+      } else if (event.keyCode == event.DOM_VK_DOWN && !popup.lastChild.disabled) {
+        popup.removeAttribute("ignorekeys");
+        popup.firstChild.blur();
+
+        // Synthesize another keydown/up cycle, this ensures the first menuitem
+        // is actually focused.
+        let keyEvent = document.createEvent("KeyboardEvent");
+        keyEvent.initKeyEvent("keydown", true, true, null, false, false,
+          false, false, keyEvent.DOM_VK_DOWN, 0);
+        popup.dispatchEvent(keyEvent);
+        keyEvent.initKeyEvent("keyup", true, true, null, false, false,
+          false, false, keyEvent.DOM_VK_DOWN, 0);
+        popup.dispatchEvent(keyEvent);
+      } else {
+        // If something was typed, then remember that we haven't searched yet.
+        quickmove.dirty = true;
+
+        // Don't stop propagation for normal keypresses.
+        return;
+      }
+      event.stopPropagation();
+      event.preventDefault();
+    },
+
+    command: function(event, executeFunc, isContext=false) {
+      let popup = event.target.parentNode;
+      executeFunc(event.target._folder);
+      event.stopPropagation();
+      quickmove.hide(popup, isContext);
+    },
+
+    openFile: function() {
+      let filebutton = document.getElementById("button-file");
+      let threadTree = document.getElementById("threadTree");
+      let messagepane = document.getElementById("messagepane");
+      if (filebutton) {
+        // There is a file button, open its popup
+        let filepopup = document.getElementById("quickmove-filebutton-menupopup");
+        filepopup.openPopup(filebutton, "after_start");
+      } else if (threadTree) {
+        // If there is a thread tree (i.e mail 3pane), then use it
+        let filepopup = document.getElementById("quickmove-menupopup");
+        let threadTreeCols = document.getElementById("threadCols");
+        let selection = threadTree.view.selection;
+        let rowOffset = threadTree.rowHeight *
+                      (selection.currentIndex - threadTree.getFirstVisibleRow() + 1) +
+                      threadTreeCols.clientHeight;
+        filepopup.openPopup(threadTree, "overlap", threadTreeCols.clientHeight, rowOffset);
+      } else if (messagepane) {
+        let filepopup = document.getElementById("quickmove-menupopup");
+        filepopup.openPopup(messagepane, "overlap");
+      } else {
+        Components.utils.reportError("Couldn't find a node to open the panel on");
+      }
+    },
+
+    openGoto: function() {
+      let folderLocation = document.getElementById("locationFolders");
+      let folderTree = document.getElementById("folderTree");
+
+      if (folderLocation) {
+        // There is a folder location popup, open its popup
+        let menupopup = document.getElementById("quickmove-folderlocation-menupopup");
+        menupopup.openPopup(folderLocation, "after_start");
+      } else if (folderTree) {
+        let popup = document.getElementById("quickmove-goto-menupopup");
+        popup.openPopup(folderTree, "overlap");
+      }
+    },
+
+    openCopy: function() {
+      let threadTree = document.getElementById("threadTree");
+      let messagepane = document.getElementById("messagepane");
+      if (threadTree) {
+        // If there is a thread tree (i.e mail 3pane), then use it
+        let filepopup = document.getElementById("quickmove-copy-menupopup");
+        let threadTreeCols = document.getElementById("threadCols");
+        let selection = threadTree.view.selection;
+        let rowOffset = threadTree.rowHeight *
+                      (selection.currentIndex - threadTree.getFirstVisibleRow() + 1) +
+                      threadTreeCols.clientHeight;
+        filepopup.openPopup(threadTree, "overlap", threadTreeCols.clientHeight, rowOffset);
+      } else if (messagepane) {
+        let filepopup = document.getElementById("quickmove-copy-menupopup");
+        filepopup.openPopup(messagepane, "overlap");
+      } else {
+        Components.utils.reportError("Couldn't find a node to open the panel on");
+      }
+    },
+
+    hide: function(popup, isContext=false) {
+      if (!isContext) {
+        popup.hidePopup();
+      }
+
+      // Hiding the menupopup should clear the search text and reset ignorekeys
+      // to be able to use the textbox.
+      popup.firstChild.value = "";
+      popup.setAttribute("ignorekeys", "true");
+
+      // Now reference the previous node, so the user can continue filing or
+      // searching
+      if (quickmove.initiator) {
+        quickmove.initiator.focus();
+        quickmove.initiator = null;
+      }
+    }
+  };
+})();
diff --git a/defaults/preferences/quickmove.js b/defaults/preferences/quickmove.js
deleted file mode 100644
index 5ed3ecd..0000000
--- a/defaults/preferences/quickmove.js
+++ /dev/null
@@ -1,10 +0,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/.
- * Portions Copyright (C) Philipp Kewisch, 2010 */
-
-// The maximum number of recent folder entries.
-pref("extensions.quickmove.maxRecentFolders", 15);
-
-// Mark messages as read when moving them
-pref("extensions.quickmove.markAsRead", true);
diff --git a/install.rdf b/install.rdf
deleted file mode 100644
index 277d0ef..0000000
--- a/install.rdf
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/.
-   - Portions Copyright (C) Philipp Kewisch, 2009 -->
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>quickmove@mozilla.kewis.ch</em:id>
-    <em:type>2</em:type>
-    <em:version>1.6.1</em:version>
-    <em:hasEmbeddedWebExtension>true</em:hasEmbeddedWebExtension>
-
-    <em:name>Quick Folder Move</em:name>
-    <em:description>Quickly move messages into other folders using the keyboard</em:description>
-
-    <em:creator>Philipp Kewisch</em:creator>
-    <em:iconURL>chrome://messenger/skin/activity/moveMailIcon.png</em:iconURL>
-
-    <em:translator>Kostyantyn Zhytnetskyy (uk and ru)</em:translator>
-    <em:translator>Philipp Kewisch (de)</em:translator>
-
-    <em:localized>
-      <Description>
-        <em:locale>de</em:locale>
-        <em:name>Schnelles Nachrichtenverschieben</em:name>
-        <em:description>Schnelles verschieben von Nachrichten in andere Ordner mit Hilfe der Tastatur</em:description>
-      </Description>
-    </em:localized>
-
-    <em:localized>
-      <Description>
-        <em:locale>uk</em:locale>
-        <em:name>Quick Folder Move</em:name>
-        <em:description>Швидко переміщуйте повідомлення в інші папки використовуючи сполучення клавіш</em:description>
-      </Description>
-    </em:localized>
-
-    <em:localized>
-      <Description>
-        <em:locale>ru</em:locale>
-        <em:name>Quick Folder Move</em:name>
-        <em:description>Быстро перемещайте сообщения в другие папки используя сочетания клавиш</em:description>
-      </Description>
-    </em:localized>
-
-    <em:targetApplication>
-      <Description>
-        <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> <!-- thunderbird -->
-        <em:minVersion>60.0</em:minVersion>
-        <em:maxVersion>60.*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-  </Description>
-</RDF>
diff --git a/webextension/manifest.json b/manifest.json
similarity index 53%
rename from webextension/manifest.json
rename to manifest.json
index 0289432..b740e77 100644
--- a/webextension/manifest.json
+++ b/manifest.json
@@ -2,25 +2,31 @@
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "default_locale": "en",
   "author": "Philipp Kewisch",
   "applications": {
     "gecko": {
-      "id": "quickmove@mozilla.kewis.ch"
+      "id": "quickmove@mozilla.kewis.ch",
+      "strict_min_version": "68.0"
     }
   },
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "quickmove@mozilla.kewis.ch",
+      "strict_min_version": "68.0"
+    }
+  },
+  "legacy": {
+    "type": "bootstrap"
+  },
   "icons": {
-    "16": "images/addon.svg",
-    "32": "images/addon.svg",
-    "48": "images/addon.svg",
-    "128": "images/addon.svg"
+    "32": "content/addon.png"
   },
   "options_ui": {
     "page": "options/options.html",
     "browser_style": true
   },
-
   "permissions": [
     "storage"
   ]
diff --git a/modules/Quickmove.jsm b/modules/Quickmove.jsm
deleted file mode 100644
index e6f0d5a..0000000
--- a/modules/Quickmove.jsm
+++ /dev/null
@@ -1,90 +0,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/.
- * Portions Copyright (C) Philipp Kewisch, 2018 */
-
-ChromeUtils.import("resource://gre/modules/LegacyExtensionsUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Preferences.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
-
-this.EXPORTED_SYMBOLS = ["Quickmove"];
-
-
-var Quickmove = {
-  getString: function(aStringName, aParams) {
-    let propName = "chrome://quickmove/locale/quickmove.properties";
-    try {
-        let props = Services.strings.createBundle(propName);
-
-        if (aParams && aParams.length) {
-            return props.formatStringFromName(aStringName, aParams, aParams.length);
-        } else {
-            return props.GetStringFromName(aStringName);
-        }
-    } catch (ex) {
-        let s = `Failed to read ${aStringName} from ${propName}.`;
-        Components.utils.reportError(s + " Error: " + ex);
-        return s;
-    }
-  },
-
-  getFullName: function(aFolder) {
-    let folder = aFolder;
-    let fullPath = [];
-
-    while (folder && folder.parent) {
-      fullPath.unshift(folder.prettyName);
-      folder = folder.parent;
-    }
-
-    return fullPath.join("/");
-  },
-
-  /**
-   * Clear all items except the menuseparator and the search box
-   */
-  clearItems: function(popup) {
-    while (popup.lastChild.className != "quickmove-separator") {
-      popup.removeChild(popup.lastChild);
-    }
-  },
-
-};
-
-function webExtensionMessageHandler(msg, sender, sendReply) {
-  if (msg.action == "get-prefs") {
-    sendReply({
-      maxRecentFolders: Preferences.get("extensions.quickmove.maxRecentFolders", 15),
-      markAsRead: Preferences.get("extensions.quickmove.markAsRead", true)
-    });
-  } else if (msg.action == "set-prefs") {
-    Preferences.set("extensions.quickmove.maxRecentFolders", msg.prefs.maxRecentFolders);
-    Preferences.set("extensions.quickmove.markAsRead", msg.prefs.markAsRead);
-  }
-}
-
-/**
- * WebExtension startup code
- */
-(async function() {
-  let id = "quickmove@mozilla.kewis.ch";
-  let addon = await AddonManager.getAddonByID(id);
-
-  let res = Services.io.getProtocolHandler("resource").QueryInterface(Ci.nsIResProtocolHandler)
-  let resourceURI = Services.io.newURI(res.resolveURI(Services.io.newURI("resource://quickmove/")));
-
-  let webex = LegacyExtensionsUtils.getEmbeddedExtensionFor({
-    id: id,
-    version: addon.version,
-    resourceURI: resourceURI
-  });
-
-  if (webex.started) {
-    return;
-  }
-
-  let { browser } = await webex.startup(1);
-
-  browser.runtime.onMessage.addListener(webExtensionMessageHandler);
-})().catch(Components.utils.reportError.bind(Components.utils));
diff --git a/webextension/options/options.css b/options/extension.css
similarity index 100%
rename from webextension/options/options.css
rename to options/extension.css
diff --git a/options/options.css b/options/options.css
new file mode 100644
index 0000000..1695638
--- /dev/null
+++ b/options/options.css
@@ -0,0 +1,8 @@
+/* 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/.
+ * Portions Copyright (C) Philipp Kewisch, 2019 */
+
+html, body {
+  margin-top: 1ex;
+}
diff --git a/webextension/options/options.html b/options/options.html
similarity index 60%
rename from webextension/options/options.html
rename to options/options.html
index 74b4813..634daf5 100644
--- a/webextension/options/options.html
+++ b/options/options.html
@@ -1,9 +1,14 @@
 <!DOCTYPE html>
+<!-- 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/.
+   - Portions Copyright (C) Philipp Kewisch, 2019 -->
 
 <html>
   <head>
-    <script src="options.js"></script>
+    <link rel="stylesheet" href="extension.css" type="text/css">
     <link rel="stylesheet" href="options.css" type="text/css">
+    <script src="options.js"></script>
   </head>
   <body>
     <div class="browser-style">
diff --git a/webextension/options/options.js b/options/options.js
similarity index 71%
rename from webextension/options/options.js
rename to options/options.js
index 8f3a62d..92be166 100644
--- a/webextension/options/options.js
+++ b/options/options.js
@@ -1,14 +1,20 @@
 /* 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/.
- * Portions Copyright (C) Philipp Kewisch, 2018 */
+ * Portions Copyright (C) Philipp Kewisch, 2018-2019 */
 
 (async function() {
-  let storagePrefs = await browser.runtime.sendMessage({ action: "get-prefs" });
-  await browser.storage.local.set(storagePrefs);
+  let prefs = await browser.storage.local.get({
+    markAsRead: true,
+    maxRecentFolders: 15
+  });
 
-  for (let [name, value] of Object.entries(storagePrefs)) {
+  for (let [name, value] of Object.entries(prefs)) {
     let node = document.getElementById(name);
+    if (!node) {
+      continue;
+    }
+
     if (typeof value == "boolean") {
       node.checked = value;
     } else {
@@ -28,11 +34,9 @@
   }
 
   document.body.addEventListener("change", () => {
-    let prefs = {
+    browser.storage.local.set({
       maxRecentFolders: parseInt(document.getElementById("maxRecentFolders").value, 10),
       markAsRead: document.getElementById("markAsRead").checked
-    };
-    browser.runtime.sendMessage({ action: "set-prefs", prefs: prefs });
-    browser.storage.local.set(prefs);
+    });
   });
 })();