diff --git a/webext/js/options_accounts.js b/webext/js/options_accounts.js
index 2b5b4b3..c76a14e 100644
--- a/webext/js/options_accounts.js
+++ b/webext/js/options_accounts.js
@@ -23,7 +23,7 @@ SysTrayX.Accounts = {
    * Callback for getAccounts
    */
   getAccountsCb: function (mailAccount) {
-    function createFolderTree(accountName, folders) {
+    function createFolderTreePre74(accountName, folders) {
       let result = [];
       let level = { result };
 
@@ -50,6 +50,22 @@ SysTrayX.Accounts = {
       return result;
     }
 
+    function createFolderTree(accountName, folders) {
+      function traverse(folders) {
+        if (!folders) {
+          return;
+        }
+        for (let f of folders) {
+          f.accountName = accountName;
+          traverse(f.subFolders);
+        }
+      }
+
+      traverse(folders);
+
+      return folders;
+    }
+
     let accounts = new Object();
 
     for (let i = 0; i < mailAccount.length; i++) {
@@ -120,23 +136,23 @@ SysTrayX.Accounts = {
           );
           typeLi.appendChild(typeText);
 
-<<<<<<< HEAD
           //  Create a usable folder tree
-          const folders = createFolderTree(
-            accounts[prop][i].name,
-            accounts[prop][i].folders
-          );
-=======
-          //  Create a usable folder tree <TB74
           let folders = [];
           if (BrowserInfo.version.split(".")[0] < 74) {
-            folders = createFolderTree(accounts[prop][i].folders);
+            //  Pre TB74 accounts API
+            folders = createFolderTreePre74(
+              accounts[prop][i].name,
+              accounts[prop][i].folders
+            );
           } else {
-            folders = accounts[prop][i].folders;
+            //  TB74+ accounts API, (this shit never ends...)
+            folders = createFolderTree(
+              accounts[prop][i].name,
+              accounts[prop][i].folders
+            );
           }
 
           console.debug("Folders: " + JSON.stringify(folders));
->>>>>>> develop
 
           //  Recursive list creator
           function createListLevel(level, parent) {