diff -Nru tbsync-1.5/bootstrap.js tbsync-1.7/bootstrap.js
--- tbsync-1.5/bootstrap.js	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/bootstrap.js	2019-02-26 16:25:49.000000000 +0000
@@ -15,31 +15,20 @@
 Components.utils.import("resource://gre/modules/Task.jsm");
 Components.utils.import("resource://gre/modules/osfile.jsm");
 
-let window = null;
-
 //Observer to catch loading of thunderbird main window
 let onLoadObserver = {
     observe: function(aSubject, aTopic, aData) {        
-        if (window === null) {
-            window = Services.wm.getMostRecentWindow("mail:3pane");
-            if (window) {
-                //init TbSync
-                window.tbSync = tbSync;
-                tbSync.init(window); 
-            } else {
-                tbSync.dump("FAIL", "Could not init TbSync, because mail:3pane window not found.");
-            }
+        let mainWindow = Services.wm.getMostRecentWindow("mail:3pane");
+        if (mainWindow) {
+            //init TbSync
+            mainWindow.tbSyncReference = tbSync;
+            tbSync.init(mainWindow); 
+        } else {
+            tbSync.dump("FAIL", "Could not init TbSync, because mail:3pane window not found.");
         }
     }
 }
 
-let onLoadDoneObserver = {
-    observe: function(aSubject, aTopic, aData) {        
-        forEachOpenWindow(loadIntoWindow);  
-        Services.wm.addListener(WindowListener);
-    }
-}
-
 function install(data, reason) {
 }
 
@@ -61,7 +50,6 @@
         branch.setIntPref("log.userdatalevel", 0); //0 - metadata (no incomming xml/wbxml, only parsed data without userdata (except failing items))   1 - including userdata,  2 - raw xml , 3 - raw wbxml
 
         Components.utils.import("chrome://tbsync/content/tbsync.jsm");
-        Components.utils.import("chrome://tbsync/content/OverlayManager.jsm");
 
         //Map local writeAsyncJSON into tbSync
         tbSync.writeAsyncJSON = writeAsyncJSON;
@@ -69,10 +57,8 @@
         //add startup observers
         Services.obs.addObserver(onLoadObserver, "mail-startup-done", false);
         Services.obs.addObserver(onLoadObserver, "tbsync.init", false);
-        Services.obs.addObserver(onLoadDoneObserver, "tbsync.init.done", false);
 
         tbSync.addonData = data;
-        tbSync.overlayManager = new OverlayManager(data, {verbose:0});
 
         if (reason != APP_STARTUP) {
             //during startup, we wait until mail-startup-done fired, for all other reasons we need to fire our own init
@@ -92,12 +78,12 @@
         //remove startup observer
         Services.obs.removeObserver(onLoadObserver, "mail-startup-done");
         Services.obs.removeObserver(onLoadObserver, "tbsync.init");
-        Services.obs.removeObserver(onLoadDoneObserver, "tbsync.init.done");
         
         //call cleanup of the tbSync module
-        forEachOpenWindow(unloadFromWindow);
-        Services.wm.removeListener(WindowListener);
         tbSync.cleanup();
+
+        let mainWindow = Services.wm.getMostRecentWindow("mail:3pane");
+        delete mainWindow.tbSyncReference;
         
         //abort write timers and write current file content to disk 
         if (tbSync.enabled) {
@@ -124,55 +110,6 @@
 
 
 
-
-function forEachOpenWindow(todo)  // Apply a function to all open windows
-{
-    var windows = Services.wm.getEnumerator(null);
-    while (windows.hasMoreElements()) {
-        todo(windows.getNext().QueryInterface(Components.interfaces.nsIDOMWindow));
-    }
-}
-
-function loadIntoWindow(window) {
-    //do not inject into main window, because we have done that in tbSync.init() to provide an option to the user to get the Ooops message, 
-    //in case something went wrong during init (and we do not reach this point)
-    if (window.location.href != "chrome://messenger/content/messenger.xul" && tbSync.overlayManager.hasRegisteredOverlays(window)) {
-        window.tbSync = tbSync;
-        tbSync.overlayManager.injectAllOverlays(window);
-    }
-}
-    
-function unloadFromWindow(window) {
-    if (tbSync.overlayManager.hasRegisteredOverlays(window)) {
-        tbSync.overlayManager.removeAllOverlays(window);
-        window.tbSync = null;
-    }
-}
-
-var WindowListener =
-{
-    onOpenWindow: function(xulWindow)
-    {
-        var window = xulWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIDOMWindow);
-        function onWindowLoad()
-        {
-            window.removeEventListener("load", onWindowLoad);
-            loadIntoWindow(window);
-        }
-        window.addEventListener("load", onWindowLoad);
-    },
-    onCloseWindow: function(xulWindow) { },
-    onWindowTitleChange: function(xulWindow, newTitle) { }
-};
-
-/* 
- could be replaced in TB61:
-  - https://dxr.mozilla.org/comm-central/rev/18881dd127e3b0c0d3f97390c9094e309d4dd9c1/mail/test/resources/jsbridge/jsbridge/extension/bootstrap.js#17
-  - https://dxr.mozilla.org/comm-central/rev/18881dd127e3b0c0d3f97390c9094e309d4dd9c1/common/src/extensionSupport.jsm#151
-*/
-
-
-
 
 function writeAsyncJSON (obj, filename) {
     let filepath = tbSync.getAbsolutePath(filename);
diff -Nru tbsync-1.5/content/abServerSearch.js tbsync-1.7/content/abServerSearch.js
--- tbsync-1.5/content/abServerSearch.js	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/abServerSearch.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-/*
- * This file is part of TbSync.
- *
- * 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/. 
- */
- 
- "use strict";
-
-Components.utils.import("resource://gre/modules/Task.jsm");
-
-//this is used in multiple places (addressbook + contactsidebar) so we cannot use objects of tbSync to store states, but need to store distinct variables
-//in the window scope -> window.tbSync_XY
-
-var serverSearch = {};
-
-serverSearch.eventHandlerWindowReference = function (window) {
-	this.window = window;
-    
-    this.removeEventListener = function (element, type, bubble) {
-        element.removeEventListener(type, this, bubble);
-    };
-
-    this.addEventListener = function (element, type, bubble) {
-        element.addEventListener(type, this, bubble);
-    };
-    
-    this.handleEvent = function(event) {
-        switch(event.type) {
-            case 'input':
-                serverSearch.onSearchInputChanged(this.window);
-                break;
-            case "select":
-                {
-                    serverSearch.clearServerSearchResults(this.window);
-                    let searchbox =  window.document.getElementById("peopleSearchInput");
-                    let target = window.GetSelectedDirectory();
-                    if (searchbox && target) {
-                        let folders = tbSync.db.findFoldersWithSetting("target", target);
-                        if (folders.length == 1 && tbSync[tbSync.db.getAccountSetting(folders[0].account, "provider")].abServerSearch) {
-                            searchbox.setAttribute("placeholder", tbSync.getLocalizedMessage("addressbook.searchgal::" + tbSync.db.getAccountSetting(folders[0].account, "accountname")));
-                        } else {
-                            searchbox.setAttribute("placeholder", tbSync.getLocalizedMessage((target == "moz-abdirectory://?") ? "addressbook.searchall" : "addressbook.searchthis"));
-                        }
-                    }
-                }
-                break;
-        }
-    };
-    return this;
-}
-
-serverSearch.searchValuePoll = function (window, searchbox) {
-    let value = searchbox.value;
-    if (window.tbSync_searchValue != "" && value == "") {
-        serverSearch.clearServerSearchResults(window);
-    }
-    window.tbSync_searchValue = value;
-}
-
-serverSearch.onInjectIntoAddressbook = function (window) {
-    window.tbSync_eventHandler = serverSearch.eventHandlerWindowReference(window);
-	
-    let searchbox =  window.document.getElementById("peopleSearchInput");
-    if (searchbox) {
-        window.tbSync_searchValue = searchbox.value;
-        window.tbSync_searchValuePollHandler = window.setInterval(function(){serverSearch.searchValuePoll(window, searchbox)}, 200);
-        window.tbSync_eventHandler.addEventListener(searchbox, "input", false);
-    }
-    
-    let dirtree = window.document.getElementById("dirTree");
-    if (dirtree) {
-        window.tbSync_eventHandler.addEventListener(dirtree, "select", false);        
-    }
-}
-
-serverSearch.onRemoveFromAddressbook = function (window) {
-    let searchbox =  window.document.getElementById("peopleSearchInput");
-    if (searchbox) {
-        window.tbSync_eventHandler.removeEventListener(searchbox, "input", false);
-        window.clearInterval(window.tbSync_searchValuePollHandler);
-    }
-
-    let dirtree = window.document.getElementById("dirTree");
-    if (dirtree) {
-        window.tbSync_eventHandler.removeEventListener(dirtree, "select", false);        
-    }
-}
-
-serverSearch.clearServerSearchResults = function (window) {
-    let target = window.GetSelectedDirectory();
-    if (target == "moz-abdirectory://?") return; //global search not yet(?) supported
-    
-    let addressbook = tbSync.getAddressBookObject(target);
-    if (addressbook) {
-        try {
-            let oldresults = addressbook.getCardsFromProperty("X-Server-Searchresult", "TbSync", true);
-            let cardsToDelete = Components.classes["@mozilla.org/array;1"].createInstance(Components.interfaces.nsIMutableArray);
-            while (oldresults.hasMoreElements()) {
-                cardsToDelete.appendElement(oldresults.getNext(), false);
-            }
-            addressbook.deleteCards(cardsToDelete);
-        } catch (e) {
-            //if  getCardsFromProperty is not implemented, do nothing
-        }
-    }
-}
-
-serverSearch.onSearchInputChanged = Task.async (function* (window) {
-    let target = window.GetSelectedDirectory();
-    if (target == "moz-abdirectory://?") return; //global search not yet(?) supported
-	
-    let folders = tbSync.db.findFoldersWithSetting("target", target);
-    if (folders.length == 1) {
-        let searchbox = window.document.getElementById("peopleSearchInput");
-        let query = searchbox.value;        
-        let addressbook = tbSync.getAddressBookObject(target);
-
-        let account = folders[0].account;
-        let provider = tbSync.db.getAccountSetting(account, "provider");
-        let accountname = tbSync.db.getAccountSetting(account, "accountname");
-        if (tbSync[provider].abServerSearch) {
-
-            if (query.length<3) {
-                //delete all old results
-                serverSearch.clearServerSearchResults(window);
-                window.onEnterInSearchBar();
-            } else {
-                window.tbSync_serverSearchNextQuery = query;                
-                if (window.tbSync_serverSearchBusy) {
-                } else {
-                    window.tbSync_serverSearchBusy = true;
-                    while (window.tbSync_serverSearchBusy) {
-
-                        yield tbSync.sleep(1000);
-                        let currentQuery = window.tbSync_serverSearchNextQuery;
-                        window.tbSync_serverSearchNextQuery = "";
-                        let results = yield tbSync[provider].abServerSearch (account, currentQuery, "search");
-
-                        //delete all old results
-                        serverSearch.clearServerSearchResults(window);
-
-                        for (let count = 0; count < results.length; count++) {
-                            let newItem = Components.classes["@mozilla.org/addressbook/cardproperty;1"].createInstance(Components.interfaces.nsIAbCard);
-                            for (var prop in results[count].properties) {
-                                if (results[count].properties.hasOwnProperty(prop)) {
-                                    newItem.setProperty(prop, results[count].properties[prop]);
-                                }
-                            }
-                            newItem.setProperty("X-Server-Searchresult", "TbSync");
-                            addressbook.addCard(newItem);
-                        }   
-                        window.onEnterInSearchBar();
-                        if (window.tbSync_serverSearchNextQuery == "") window.tbSync_serverSearchBusy = false;
-                    }
-                }
-            }            
-        }
-    }
-})
diff -Nru tbsync-1.5/content/manager/accounts.js tbsync-1.7/content/manager/accounts.js
--- tbsync-1.5/content/manager/accounts.js	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/manager/accounts.js	2019-02-26 16:25:49.000000000 +0000
@@ -547,7 +547,7 @@
     */
     updateAccountSyncStateObserver: {
         observe: function (aSubject, aTopic, aData) {
-            if (aData != "") {
+            if (aData) {
                 //since we want rotating arrows on each syncstate change, we need to run this on each syncstate
                 tbSyncAccounts.updateAccountStatus(aData);
             }
diff -Nru tbsync-1.5/content/manager/installProvider.xul tbsync-1.7/content/manager/installProvider.xul
--- tbsync-1.5/content/manager/installProvider.xul	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/manager/installProvider.xul	2019-02-26 16:25:49.000000000 +0000
@@ -21,7 +21,7 @@
                 &manager.installprovider.link;
             </html:p>
             
-            <html:p id="link" onmouseover="this.style.cursor='pointer'" onmouseout="this.style.cursor='default'" onclick="tbSync.openTBtab(this.getAttribute('link'));" style="color:blue;text-decoration: underline;padding-left:1em;">
+            <html:p id="link" onmouseover="this.style.cursor='pointer'" onmouseout="this.style.cursor='default'" onclick="tbSync.prefWindowObj.tbSyncAccountManager.selectTab(0); tbSync.openTBtab(this.getAttribute('link'));" style="color:blue;text-decoration: underline;padding-left:1em;">
             </html:p>
 
             <html:p id="warning" style="font-weight: bold">
diff -Nru tbsync-1.5/content/OverlayManager.jsm tbsync-1.7/content/OverlayManager.jsm
--- tbsync-1.5/content/OverlayManager.jsm	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/OverlayManager.jsm	2019-02-26 16:25:49.000000000 +0000
@@ -14,8 +14,7 @@
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/Task.jsm");
 
-function OverlayManager(addonData, options = {}) {
-    this.addonData = addonData;
+function OverlayManager(options = {}) {
     this.registeredOverlays = {};
     this.overlays =  {};
     this.stylesheets = {};
@@ -28,12 +27,50 @@
 
 
 
+/* 
+ could be replaced in TB61:
+  - https://dxr.mozilla.org/comm-central/rev/18881dd127e3b0c0d3f97390c9094e309d4dd9c1/mail/test/resources/jsbridge/jsbridge/extension/bootstrap.js#17
+  - https://dxr.mozilla.org/comm-central/rev/18881dd127e3b0c0d3f97390c9094e309d4dd9c1/common/src/extensionSupport.jsm#151
+*/
+    this.windowListener = {
+        that : this,
+        onOpenWindow: function(xulWindow) {
+            let window = xulWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIDOMWindow);
+            
+            function onWindowLoad() {
+                //window.removeEventListener("load", onWindowLoad);
+                this.injectAllOverlays(window);
+            }
+            window.addEventListener("load", onWindowLoad.bind(this.that));
+        },
+        onCloseWindow: function(xulWindow) { },
+        onWindowTitleChange: function(xulWindow, newTitle) { }
+    };
 
+    
 
 
+    this.startObserving = function () {
+        let windows = Services.wm.getEnumerator(null);
+        while (windows.hasMoreElements()) {
+            let window = windows.getNext().QueryInterface(Components.interfaces.nsIDOMWindow);
+            //inject overlays for this window
+            this.injectAllOverlays(window);
+        }
 
+        Services.wm.addListener(this.windowListener);
+    };
 
+    this.stopObserving = function () {
+        Services.wm.removeListener(this.windowListener);
 
+        let  windows = Services.wm.getEnumerator(null);
+        while (windows.hasMoreElements()) {
+            let window = windows.getNext().QueryInterface(Components.interfaces.nsIDOMWindow);            
+            //remove overlays (if any)
+            this.removeAllOverlays(window);
+        }
+    };
 
     this.hasRegisteredOverlays = function (window) {
         return this.registeredOverlays.hasOwnProperty(window.location.href);
@@ -98,90 +135,118 @@
 
 
 
+    this.injectAllOverlays = function (window, _href = null) {
+        let href = (_href === null) ? window.location.href : _href;   
+        for (let i=0; this.registeredOverlays[href] && i < this.registeredOverlays[href].length; i++) {
+            this.injectOverlay(window, this.registeredOverlays[href][i]);
+        }
+    };
 
+    this.removeAllOverlays = function (window) {
+        if (!this.hasRegisteredOverlays(window))
+            return;
+        
+        for (let i=0; i < this.registeredOverlays[window.location.href].length; i++) {            
+            this.removeOverlay(window, this.registeredOverlays[window.location.href][i]);
+        }        
+    };
 
 
 
-    this.injectAllOverlays = function (window, _href = null) {
-        let href = (_href === null) ? window.location.href : _href;   
 
-        for (let i=0; this.registeredOverlays[href] && i < this.registeredOverlays[href].length; i++) {
-            if (this.options.verbose>2) Services.console.logStringMessage("[OverlayManager] Injecting: " + this.registeredOverlays[href][i]);
-            let rootNode = this.overlays[this.registeredOverlays[href][i]];
 
-            if (rootNode) {
-                let overlayNode = rootNode.documentElement;
-                if (overlayNode) {
-                    //get and load scripts
-                    let scripts = this.getScripts(rootNode, overlayNode);
-                    for (let i=0; i < scripts.length; i++){
-                        if (this.options.verbose>3) Services.console.logStringMessage("[OverlayManager] Loading: " + scripts[i]);
-                        Services.scriptloader.loadSubScript(scripts[i], window);
-                    }
+    this.injectOverlay = function (window, overlay) {
+        if (!window.hasOwnProperty("injectedOverlays")) window.injectedOverlays = [];
 
-                    //eval onbeforeinject, if that returns false, inject is aborted
-                    let inject = true;
-                    if (overlayNode.hasAttribute("onbeforeinject")) {
-                        let onbeforeinject = overlayNode.getAttribute("onbeforeinject");
-                        if (this.options.verbose>3) Services.console.logStringMessage("[OverlayManager] Executing: " + onbeforeinject);
-                        // the source for this eval is part of this XPI, cannot be changed by user.
-                        inject = window.eval(onbeforeinject);
-                    }
+        if (window.injectedOverlays.includes(overlay)) {
+            if (this.options.verbose>2) Services.console.logStringMessage("[OverlayManager] NOT Injecting: " + overlay);
+            return;
+        }            
+        
+        let rootNode = this.overlays[overlay];
 
-                    if (inject) {                        
-                        //get urls of stylesheets to add preloaded files
-                        let styleSheetUrls = this.getStyleSheetUrls(rootNode);
-                        for (let i=0; i<styleSheetUrls.length; i++) {
-                            let namespace = overlayNode.lookupNamespaceURI("html");
-                            let element = window.document.createElementNS(namespace, "style");
-                            element.id = styleSheetUrls[i];
-                            element.textContent = this.stylesheets[styleSheetUrls[i]];
-                            window.document.documentElement.appendChild(element);
-                            if (this.options.verbose>3) Services.console.logStringMessage("[OverlayManager] Stylesheet: " + styleSheetUrls[i]);
-                        }                        
-
-                        this.insertXulOverlay(window, overlayNode.children);
-                        
-                        //execute oninject
-                        if (overlayNode.hasAttribute("oninject")) {
-                            let oninject = overlayNode.getAttribute("oninject");
-                            if (this.options.verbose>3) Services.console.logStringMessage("[OverlayManager] Executing: " + oninject);
-                            // the source for this eval is part of this XPI, cannot be changed by user.
-                            window.eval(oninject);
-                        }
+        if (rootNode) {
+            let overlayNode = rootNode.documentElement;
+            if (overlayNode) {
+                //get and load scripts
+                let scripts = this.getScripts(rootNode, overlayNode);
+                for (let i=0; i < scripts.length; i++){
+                    if (this.options.verbose>3) Services.console.logStringMessage("[OverlayManager] Loading: " + scripts[i]);
+                    Services.scriptloader.loadSubScript(scripts[i], window);
+                }
+
+                //eval onbeforeinject, if that returns false, inject is aborted
+                let inject = true;
+                if (overlayNode.hasAttribute("onbeforeinject")) {
+                    let onbeforeinject = overlayNode.getAttribute("onbeforeinject");
+                    if (this.options.verbose>3) Services.console.logStringMessage("[OverlayManager] Executing: " + onbeforeinject);
+                    // the source for this eval is part of this XPI, cannot be changed by user.
+                    inject = window.eval(onbeforeinject);
+                }
+
+                if (inject) {
+                    if (this.options.verbose>2) Services.console.logStringMessage("[OverlayManager] Injecting: " + overlay);
+                    window.injectedOverlays.push(overlay);
+                    
+                    //get urls of stylesheets to add preloaded files
+                    let styleSheetUrls = this.getStyleSheetUrls(rootNode);
+                    for (let i=0; i<styleSheetUrls.length; i++) {
+                        let namespace = overlayNode.lookupNamespaceURI("html");
+                        let element = window.document.createElementNS(namespace, "style");
+                        element.id = styleSheetUrls[i];
+                        element.textContent = this.stylesheets[styleSheetUrls[i]];
+                        window.document.documentElement.appendChild(element);
+                        if (this.options.verbose>3) Services.console.logStringMessage("[OverlayManager] Stylesheet: " + styleSheetUrls[i]);
+                    }                        
+
+                    this.insertXulOverlay(window, overlayNode.children);
+                    
+                    //execute oninject
+                    if (overlayNode.hasAttribute("oninject")) {
+                        let oninject = overlayNode.getAttribute("oninject");
+                        if (this.options.verbose>3) Services.console.logStringMessage("[OverlayManager] Executing: " + oninject);
+                        // the source for this eval is part of this XPI, cannot be changed by user.
+                        window.eval(oninject);
                     }
                 }
             }
         }
     };
-    
-    this.removeAllOverlays = function (window) {
-        for (let i=0; i < this.registeredOverlays[window.location.href].length; i++) {
-            if (this.options.verbose>2) Services.console.logStringMessage("[OverlayManager] Removing: " + this.registeredOverlays[window.location.href][i]);
-            
-//            let rootNode = this.getDataFromXULString(window, this.overlays[this.registeredOverlays[window.location.href][i]]);
-            let rootNode = this.overlays[this.registeredOverlays[window.location.href][i]];
-            let overlayNode = rootNode.documentElement;
-            
-            if (overlayNode.hasAttribute("onremove")) {
-                let onremove = overlayNode.getAttribute("onremove");
-                if (this.options.verbose>3) Services.console.logStringMessage("[OverlayManager] Executing: " + onremove);
-                // the source for this eval is part of this XPI, cannot be changed by user.
-                window.eval(onremove);
-            }
 
-            this.removeXulOverlay(window, overlayNode.children);
+    this.removeOverlay = function (window, overlay) {
+        if (!window.hasOwnProperty("injectedOverlays")) window.injectedOverlays = [];
 
-            //get urls of stylesheets to remove styte tag
-            let styleSheetUrls = this.getStyleSheetUrls(rootNode);
-            for (let i=0; i<styleSheetUrls.length; i++) {
-                let element = window.document.getElementById(styleSheetUrls[i]);
-                if (element) {
-                    element.parentNode.removeChild(element);
-                }
+        if (!window.injectedOverlays.includes(overlay)) {
+            if (this.options.verbose>2) Services.console.logStringMessage("[OverlayManager] NOT Removing: " + overlay);
+            return;
+        }
+
+        if (this.options.verbose>2) Services.console.logStringMessage("[OverlayManager] Removing: " + overlay);
+        window.injectedOverlays = window.injectedOverlays.filter(e => (e != overlay));
+        
+//            let rootNode = this.getDataFromXULString(window, this.overlays[overlay]);
+        let rootNode = this.overlays[overlay];
+        let overlayNode = rootNode.documentElement;
+        
+        if (overlayNode.hasAttribute("onremove")) {
+            let onremove = overlayNode.getAttribute("onremove");
+            if (this.options.verbose>3) Services.console.logStringMessage("[OverlayManager] Executing: " + onremove);
+            // the source for this eval is part of this XPI, cannot be changed by user.
+            window.eval(onremove);
+        }
+
+        this.removeXulOverlay(window, overlayNode.children);
+
+        //get urls of stylesheets to remove styte tag
+        let styleSheetUrls = this.getStyleSheetUrls(rootNode);
+        for (let i=0; i<styleSheetUrls.length; i++) {
+            let element = window.document.getElementById(styleSheetUrls[i]);
+            if (element) {
+                element.parentNode.removeChild(element);
             }
         }
     };
+    
 
 
 
diff -Nru tbsync-1.5/content/overlays/abCardWindow.js tbsync-1.7/content/overlays/abCardWindow.js
--- tbsync-1.5/content/overlays/abCardWindow.js	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/overlays/abCardWindow.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/*
- * This file is part of TbSync.
- *
- * 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/. 
- */
- 
- "use strict";
-
-tbSync.onInjectIntoCardEditWindow = function (window) {
-    if (window.location.href=="chrome://messenger/content/addressbook/abNewCardDialog.xul") {
-        //add handler for ab switching    
-        tbSync.onAbSelectChangeNewCard(window);
-        window.document.getElementById("abPopup").addEventListener("select", function () {tbSync.onAbSelectChangeNewCard(window);}, false);
-        RegisterSaveListener(tbSync.onSaveCard);
-    
-    } else {
-        window.RegisterLoadListener(tbSync.onLoadCard);
-        window.RegisterSaveListener(tbSync.onSaveCard);
-
-        //if this window was open during inject, load the extra fields
-        if (gEditCard) tbSync.onLoadCard(gEditCard.card, window.document);
-    }
-}
-
-tbSync.onAbSelectChangeNewCard = function(window) {
-    let folders = tbSync.db.findFoldersWithSetting("target", window.document.getElementById("abPopup").value);
-    let cardProvider = "";
-    if (folders.length == 1) {
-        cardProvider = tbSync.db.getAccountSetting(folders[0].account, "provider");
-    }
-
-    //loop over all providers and show/hide container fields
-    for (let provider in tbSync.loadedProviders) {
-        let items = window.document.getElementsByClassName(provider + "Container");
-        for (let i=0; i < items.length; i++) {
-            items[i].hidden = (cardProvider != provider);
-        }
-        //call custom function to do additional tasks
-        if (tbSync[provider].onAbCardLoad) tbSync[provider].onAbCardLoad(window.document, cardProvider == provider);
-    }            
-}
-
-tbSync.getSelectedAbFromArgument = function (arg) {
-    let abURI = "";
-    if (arg.hasOwnProperty("abURI")) {
-        abURI = arg.abURI;
-    } else if (arg.hasOwnProperty("selectedAB")) {
-        abURI = arg.selectedAB;
-    }
-    
-    if (abURI) {
-        let abManager = Components.classes["@mozilla.org/abmanager;1"].getService(Components.interfaces.nsIAbManager);
-        let ab = abManager.getDirectory(abURI);
-        if (ab.isMailList) {
-            let parts = abURI.split("/");
-            parts.pop();
-            return parts.join("/");
-        }
-    }
-    return abURI;
-},
-
-tbSync.onLoadCard = function (aCard, aDocument) {
-    let aParentDirURI = tbSync.getSelectedAbFromArgument(window.arguments[0]);
-
-    let cardProvider = "";
-    if (aParentDirURI) { //could be undefined
-        let folders = tbSync.db.findFoldersWithSetting("target", aParentDirURI);
-        if (folders.length == 1) {
-            cardProvider = tbSync.db.getAccountSetting(folders[0].account, "provider");
-        }
-    }
-    
-    let items = aDocument.getElementsByClassName(cardProvider + "Property");
-    for (let i=0; i < items.length; i++) {
-        items[i].value = aCard.getProperty(items[i].id, "");
-    }
-
-    //loop over all providers and show/hide container fields
-    for (let provider in tbSync.loadedProviders) {
-        let container = aDocument.getElementsByClassName(provider + "Container");
-        for (let i=0; i < container.length; i++) {
-            container[i].hidden = (cardProvider != provider);
-        }
-        //call custom function to do additional tasks
-        if (tbSync[provider].onAbCardLoad) tbSync[provider].onAbCardLoad(aDocument, cardProvider == provider, aCard);
-    }          
-}
-
-
-tbSync.onSaveCard = function (aCard, aDocument) {
-    let aParentDirURI = tbSync.getSelectedAbFromArgument(window.arguments[0]);
-    
-    let cardProvider = "";
-    if (aParentDirURI) { //could be undefined
-        let folders = tbSync.db.findFoldersWithSetting("target", aParentDirURI);
-        if (folders.length == 1) {
-            cardProvider = tbSync.db.getAccountSetting(folders[0].account, "provider");
-        }
-    }
-
-    let items = aDocument.getElementsByClassName(cardProvider + "Property");
-    for (let i=0; i < items.length; i++) {
-        aCard.setProperty(items[i].id, items[i].value);
-    }
-}
diff -Nru tbsync-1.5/content/overlays/abCardWindow.xul tbsync-1.7/content/overlays/abCardWindow.xul
--- tbsync-1.5/content/overlays/abCardWindow.xul	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/overlays/abCardWindow.xul	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window SYSTEM "chrome://tbsync/locale/eas.dtd">
-
-<overlay 
-	id="abCardWindow" 
-	oninject="tbSync.onInjectIntoCardEditWindow(window)"
-	xmlns:html="http://www.w3.org/1999/xhtml">
-	
-   <script type="application/javascript" src="chrome://tbsync/content/overlays/abCardWindow.js" />
-
-</overlay>
-
-
-
diff -Nru tbsync-1.5/content/overlays/abNewCardIconsOverlay.js tbsync-1.7/content/overlays/abNewCardIconsOverlay.js
--- tbsync-1.5/content/overlays/abNewCardIconsOverlay.js	1970-01-01 00:00:00.000000000 +0000
+++ tbsync-1.7/content/overlays/abNewCardIconsOverlay.js	2019-02-26 16:25:49.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ * This file is part of TbSync.
+ *
+ * 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/. 
+ */
+ 
+ "use strict";
+
+Components.utils.import("chrome://tbsync/content/tbsync.jsm");
+
+var tbSyncNewCardIcons = {
+
+    onInject: function (window) {
+        let items = window.document.getElementsByClassName("abMenuItem");
+        for (let i=0; i < items.length; i++) {
+            let icon = "";
+            let abURI = items[i].value;
+            
+            if (abURI) {
+                let abManager = Components.classes["@mozilla.org/abmanager;1"].getService(Components.interfaces.nsIAbManager);
+                let ab = abManager.getDirectory(abURI);
+                if (!ab.isMailList && !ab.isRemote) {
+                    try {
+                        icon = ab.getStringValue("tbSyncIcon", "");
+                    } catch (e) {}
+                }
+            }
+            
+            if (icon) {
+                items[i].setAttribute("TbSyncIcon", icon);
+            }
+        }
+    },
+
+    onRemove: function (window) {
+        let items = window.document.getElementsByClassName("abMenuItem");
+        for (let i=0; i < items.length; i++) {
+            if (items[i].getAttribute("TbSyncIcon")) {
+                items[i].removeAttribute("TbSyncIcon");
+            }
+        }
+    }
+}
diff -Nru tbsync-1.5/content/overlays/abNewCardIconsOverlay.xul tbsync-1.7/content/overlays/abNewCardIconsOverlay.xul
--- tbsync-1.5/content/overlays/abNewCardIconsOverlay.xul	1970-01-01 00:00:00.000000000 +0000
+++ tbsync-1.7/content/overlays/abNewCardIconsOverlay.xul	2019-02-26 16:25:49.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<overlay 
+	id="TbSyncNewCardIconOverlay" 
+	oninject="tbSyncNewCardIcons.onInject(window)"
+	onremove="tbSyncNewCardIcons.onRemove(window)"
+	xmlns:html="http://www.w3.org/1999/xhtml">
+
+   <script type="application/javascript" src="chrome://tbsync/content/overlays/abNewCardIconsOverlay.js" />
+
+</overlay>        
diff -Nru tbsync-1.5/content/overlays/abServerSearch.js tbsync-1.7/content/overlays/abServerSearch.js
--- tbsync-1.5/content/overlays/abServerSearch.js	1970-01-01 00:00:00.000000000 +0000
+++ tbsync-1.7/content/overlays/abServerSearch.js	2019-02-26 16:25:49.000000000 +0000
@@ -0,0 +1,162 @@
+/*
+ * This file is part of TbSync.
+ *
+ * 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/. 
+ */
+ 
+ "use strict";
+
+Components.utils.import("chrome://tbsync/content/tbsync.jsm");
+Components.utils.import("resource://gre/modules/Task.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
+
+var tbSyncAbServerSearch = {
+
+    onInject: function (window) {
+        this._eventHandler = tbSyncAbServerSearch.eventHandlerWindowReference(window);
+        
+        let searchbox =  window.document.getElementById("peopleSearchInput");
+        if (searchbox) {
+            this._searchValue = searchbox.value;
+            this._searchValuePollHandler = window.setInterval(function(){tbSyncAbServerSearch.searchValuePoll(window, searchbox)}, 200);
+            this._eventHandler.addEventListener(searchbox, "input", false);
+        }
+        
+        let dirtree = window.document.getElementById("dirTree");
+        if (dirtree) {
+            this._eventHandler.addEventListener(dirtree, "select", false);        
+        }
+    },
+    
+    onRemove: function (window) {
+        let searchbox =  window.document.getElementById("peopleSearchInput");
+        if (searchbox) {
+            this._eventHandler.removeEventListener(searchbox, "input", false);
+            window.clearInterval(this._searchValuePollHandler);
+        }
+
+        let dirtree = window.document.getElementById("dirTree");
+        if (dirtree) {
+            this._eventHandler.removeEventListener(dirtree, "select", false);        
+        }
+    },    
+
+    eventHandlerWindowReference: function (window) {
+        this.window = window;
+        
+        this.removeEventListener = function (element, type, bubble) {
+            element.removeEventListener(type, this, bubble);
+        };
+
+        this.addEventListener = function (element, type, bubble) {
+            element.addEventListener(type, this, bubble);
+        };
+        
+        this.handleEvent = function(event) {
+            switch(event.type) {
+                case 'input':
+                    tbSyncAbServerSearch.onSearchInputChanged(this.window);
+                    break;
+                case "select":
+                    {
+                        tbSyncAbServerSearch.clearServerSearchResults(this.window);
+                        let searchbox =  window.document.getElementById("peopleSearchInput");
+                        let target = window.GetSelectedDirectory();
+                        if (searchbox && target) {
+                            let folders = tbSync.db.findFoldersWithSetting("target", target);
+                            if (folders.length == 1 && tbSync[tbSync.db.getAccountSetting(folders[0].account, "provider")].abServerSearch) {
+                                searchbox.setAttribute("placeholder", tbSync.getLocalizedMessage("addressbook.searchgal::" + tbSync.db.getAccountSetting(folders[0].account, "accountname")));
+                            } else {
+                                searchbox.setAttribute("placeholder", tbSync.getLocalizedMessage((target == "moz-abdirectory://?") ? "addressbook.searchall" : "addressbook.searchthis"));
+                            }
+                        }
+                    }
+                    break;
+            }
+        };
+        return this;
+    },
+
+    searchValuePoll: function (window, searchbox) {
+        let value = searchbox.value;
+        if (this._searchValue != "" && value == "") {
+            tbSyncAbServerSearch.clearServerSearchResults(window);
+        }
+        this._searchValue = value;
+    },
+
+    clearServerSearchResults: function (window) {
+        let target = window.GetSelectedDirectory();
+        if (target == "moz-abdirectory://?") return; //global search not yet(?) supported
+        
+        let addressbook = tbSync.getAddressBookObject(target);
+        if (addressbook) {
+            try {
+                let oldresults = addressbook.getCardsFromProperty("X-Server-Searchresult", "TbSync", true);
+                let cardsToDelete = Components.classes["@mozilla.org/array;1"].createInstance(Components.interfaces.nsIMutableArray);
+                while (oldresults.hasMoreElements()) {
+                    cardsToDelete.appendElement(oldresults.getNext(), false);
+                }
+                addressbook.deleteCards(cardsToDelete);
+            } catch (e) {
+                //if  getCardsFromProperty is not implemented, do nothing
+            }
+        }
+    },
+
+    onSearchInputChanged: Task.async (function* (window) {
+        let target = window.GetSelectedDirectory();
+        if (target == "moz-abdirectory://?") return; //global search not yet(?) supported
+        
+        let folders = tbSync.db.findFoldersWithSetting("target", target);
+        if (folders.length == 1) {
+            let searchbox = window.document.getElementById("peopleSearchInput");
+            let query = searchbox.value;        
+            let addressbook = tbSync.getAddressBookObject(target);
+
+            let account = folders[0].account;
+            let provider = tbSync.db.getAccountSetting(account, "provider");
+            let accountname = tbSync.db.getAccountSetting(account, "accountname");
+            if (tbSync[provider].abServerSearch) {
+
+                if (query.length<3) {
+                    //delete all old results
+                    tbSyncAbServerSearch.clearServerSearchResults(window);
+                    window.onEnterInSearchBar();
+                } else {
+                    this._serverSearchNextQuery = query;                
+                    if (this._serverSearchBusy) {
+                        //NOOP
+                    } else {
+                        this._serverSearchBusy = true;
+                        while (this._serverSearchBusy) {
+
+                            yield tbSync.sleep(1000);
+                            let currentQuery = this._serverSearchNextQuery;
+                            this._serverSearchNextQuery = "";
+                            let results = yield tbSync[provider].abServerSearch (account, currentQuery, "search");
+
+                            //delete all old results
+                            tbSyncAbServerSearch.clearServerSearchResults(window);
+
+                            for (let count = 0; count < results.length; count++) {
+                                let newItem = Components.classes["@mozilla.org/addressbook/cardproperty;1"].createInstance(Components.interfaces.nsIAbCard);
+                                for (var prop in results[count].properties) {
+                                    if (results[count].properties.hasOwnProperty(prop)) {
+                                        newItem.setProperty(prop, results[count].properties[prop]);
+                                    }
+                                }
+                                newItem.setProperty("X-Server-Searchresult", "TbSync");
+                                addressbook.addCard(newItem);
+                            }   
+                            window.onEnterInSearchBar();
+                            if (this._serverSearchNextQuery == "") this._serverSearchBusy = false;
+                        }
+                    }
+                }            
+            }
+        }
+    })
+}
\ No newline at end of file
diff -Nru tbsync-1.5/content/overlays/abServerSearch.xul tbsync-1.7/content/overlays/abServerSearch.xul
--- tbsync-1.5/content/overlays/abServerSearch.xul	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/overlays/abServerSearch.xul	2019-02-26 16:25:49.000000000 +0000
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
 <overlay 
-	id="abServerSearchOverlay" 
-	oninject="tbSync.serverSearch.onInjectIntoAddressbook(window)"
-	onremove="tbSync.serverSearch.onRemoveFromAddressbook(window)"
+	id="TbSyncAbServerSearchOverlay" 
+	oninject="tbSyncAbServerSearch.onInject(window)"
+	onremove="tbSyncAbServerSearch.onRemove(window)"
 	xmlns:html="http://www.w3.org/1999/xhtml">
 
+   <script type="application/javascript" src="chrome://tbsync/content/overlays/abServerSearch.js" />
+
 </overlay>        
diff -Nru tbsync-1.5/content/overlays/addressbookiconsoverlay.js tbsync-1.7/content/overlays/addressbookiconsoverlay.js
--- tbsync-1.5/content/overlays/addressbookiconsoverlay.js	1970-01-01 00:00:00.000000000 +0000
+++ tbsync-1.7/content/overlays/addressbookiconsoverlay.js	2019-02-26 16:25:49.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ * This file is part of TbSync.
+ *
+ * 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/. 
+ */
+ 
+ "use strict";
+
+Components.utils.import("chrome://tbsync/content/tbsync.jsm");
+
+var tbSyncAddressBook = {
+
+    onInject: function (window) {
+        //hook into getProperties of abDirTreeItem to inject our own icons for the address books
+        if (!window.abDirTreeItem.prototype.hasOwnProperty("_origBeforeTbSyncGetProperties")) {
+            window.abDirTreeItem.prototype._origBeforeTbSyncGetProperties = window.abDirTreeItem.prototype.getProperties;
+            window.abDirTreeItem.prototype.getProperties = function () {
+                //get original properties
+                let properties = this._origBeforeTbSyncGetProperties().split(" ");
+                
+                let type = "";
+                if (!this._directory.isMailList && !this._directory.isRemote) {
+                    try {
+                        type = this._directory.getStringValue("tbSyncIcon", "");
+                    } catch (e) {}
+                }
+                
+                if (type) properties.push(type);
+                return properties.join(" ");
+            }
+        }
+    },
+
+    onRemove: function (window) {
+        window.abDirTreeItem.prototype.getProperties = window.abDirTreeItem.prototype._origBeforeTbSyncGetProperties;
+        delete window.abDirTreeItem.prototype._origBeforeTbSyncGetProperties;
+    }
+}
diff -Nru tbsync-1.5/content/overlays/addressbookiconsoverlay.xul tbsync-1.7/content/overlays/addressbookiconsoverlay.xul
--- tbsync-1.5/content/overlays/addressbookiconsoverlay.xul	1970-01-01 00:00:00.000000000 +0000
+++ tbsync-1.7/content/overlays/addressbookiconsoverlay.xul	2019-02-26 16:25:49.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<overlay 
+	id="TbSyncAbIconOverlay" 
+	oninject="tbSyncAddressBook.onInject(window)"
+	onremove="tbSyncAddressBook.onRemove(window)"
+	xmlns:html="http://www.w3.org/1999/xhtml">
+
+   <script type="application/javascript" src="chrome://tbsync/content/overlays/addressbookiconsoverlay.js" />
+
+</overlay>        
diff -Nru tbsync-1.5/content/overlays/addressbookoverlay.js tbsync-1.7/content/overlays/addressbookoverlay.js
--- tbsync-1.5/content/overlays/addressbookoverlay.js	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/overlays/addressbookoverlay.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-/*
- * This file is part of TbSync.
- *
- * 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/. 
- */
- 
- "use strict";
-
-tbSync.onInjectIntoAddressbook = function (window) {
-    if (window.document.getElementById("abResultsTree")) {
-    window.document.getElementById("abResultsTree").addEventListener("select", tbSync.onAbResultsPaneSelectionChanged, false);
-        tbSync.onAbResultsPaneSelectionChanged();
-    }
-    
-    //hook into getProperties of abDirTreeItem to inject our own icons for the address books
-    window.abDirTreeItem.prototype._origBeforeTbSyncGetProperties = window.abDirTreeItem.prototype.getProperties;
-    window.abDirTreeItem.prototype.getProperties = function () {
-        //get original properties
-        let properties = this._origBeforeTbSyncGetProperties().split(" ");
-        
-        let type = "";
-        if (!this._directory.isMailList && !this._directory.isRemote) {
-            try {
-                type = this._directory.getStringValue("tbSyncIcon", "");
-            } catch (e) {}
-        }
-        
-        if (type) properties.push(type);
-        return properties.join(" ");
-    }
-}
-
-tbSync.onRemoveFromAddressbook = function (window) {
-    if (window.document.getElementById("abResultsTree")) {
-        window.document.getElementById("abResultsTree").removeEventListener("select", tbSync.onAbResultsPaneSelectionChanged, false);
-    }
-    //remove our injection
-    window.abDirTreeItem.prototype.getProperties = window.abDirTreeItem.prototype._origBeforeTbSyncGetProperties;   
-}
-
-tbSync.onAbResultsPaneSelectionChanged = function () {
-    //hide all extra fields of all providers
-    for (let provider in tbSync.loadedProviders) {
-        let container = window.document.getElementsByClassName(provider + "Container");
-        for (let i=0; i < container.length; i++) {
-            container[i].hidden = true;
-        }
-    }
-    
-    let cards = window.GetSelectedAbCards();
-    if (cards.length == 1) {
-        let aParentDirURI = window.GetSelectedDirectory();
-        let abManager = Components.classes["@mozilla.org/abmanager;1"].getService(Components.interfaces.nsIAbManager);
-        let selectedBook = abManager.getDirectory(aParentDirURI);
-        if (selectedBook.isMailList) {
-            aParentDirURI = aParentDirURI.substring(0, aParentDirURI.lastIndexOf("/"));
-        }
-
-        if (aParentDirURI) { //could be undefined
-            let folders = tbSync.db.findFoldersWithSetting("target", aParentDirURI);
-            if (folders.length == 1) {
-                let provider = tbSync.db.getAccountSetting(folders[0].account, "provider");
-                if (tbSync[provider].onAbResultsPaneSelectionChanged) {
-                    tbSync[provider].onAbResultsPaneSelectionChanged(window, cards[0]);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff -Nru tbsync-1.5/content/overlays/addressbookoverlay.xul tbsync-1.7/content/overlays/addressbookoverlay.xul
--- tbsync-1.5/content/overlays/addressbookoverlay.xul	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/overlays/addressbookoverlay.xul	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<overlay 
-	id="abOverlay" 
-	oninject="tbSync.onInjectIntoAddressbook(window)"
-	onremove="tbSync.onRemoveFromAddressbook(window)"
-	xmlns:html="http://www.w3.org/1999/xhtml">
-
-   <script type="application/javascript" src="chrome://tbsync/content/overlays/addressbookoverlay.js" />
-
-</overlay>        
diff -Nru tbsync-1.5/content/overlays/calendar-event-dialog-attendees.js tbsync-1.7/content/overlays/calendar-event-dialog-attendees.js
--- tbsync-1.5/content/overlays/calendar-event-dialog-attendees.js	1970-01-01 00:00:00.000000000 +0000
+++ tbsync-1.7/content/overlays/calendar-event-dialog-attendees.js	2019-02-26 16:25:49.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+ * This file is part of TbSync.
+ *
+ * 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/. 
+ */
+ 
+ "use strict";
+
+Components.utils.import("chrome://tbsync/content/tbsync.jsm");
+
+var tbSyncAttendeeEventDialog = {
+
+    onInject: function (window) {
+        // Add autoComplete for TbSync
+        if (window.document.getElementById("attendeeCol3#1")) {
+            let autocompletesearch = window.document.getElementById("attendeeCol3#1").getAttribute("autocompletesearch");
+            if (autocompletesearch.indexOf("tbSyncAutoCompleteSearch") == -1) {
+                window.document.getElementById("attendeeCol3#1").setAttribute("autocompletesearch", autocompletesearch + " tbSyncAutoCompleteSearch");
+            }
+        }    
+    },
+
+    onRemove: function (window) {
+        // Remove autoComplete for TbSync
+        if (window.document.getElementById("attendeeCol3#1")) {
+            let autocompletesearch = window.document.getElementById("attendeeCol3#1").getAttribute("autocompletesearch").replace("tbSyncAutoCompleteSearch", "");
+            window.document.getElementById("attendeeCol3#1").setAttribute("autocompletesearch", autocompletesearch.trim());
+        }
+    }
+
+}
diff -Nru tbsync-1.5/content/overlays/calendar-event-dialog-attendees.xul tbsync-1.7/content/overlays/calendar-event-dialog-attendees.xul
--- tbsync-1.5/content/overlays/calendar-event-dialog-attendees.xul	1970-01-01 00:00:00.000000000 +0000
+++ tbsync-1.7/content/overlays/calendar-event-dialog-attendees.xul	2019-02-26 16:25:49.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<overlay 
+	id="TbSyncAttendeeEventDialogOverlay" 
+	oninject="tbSyncAttendeeEventDialog.onInject(window)"
+	onremove="tbSyncAttendeeEventDialog.onRemove(window)"
+	xmlns:html="http://www.w3.org/1999/xhtml">
+
+   <script type="application/javascript" src="chrome://tbsync/content/overlays/calendar-event-dialog-attendees.js" />
+
+</overlay>        
diff -Nru tbsync-1.5/content/overlays/messengercompose.js tbsync-1.7/content/overlays/messengercompose.js
--- tbsync-1.5/content/overlays/messengercompose.js	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/overlays/messengercompose.js	2019-02-26 16:25:49.000000000 +0000
@@ -9,50 +9,49 @@
  "use strict";
 
 Components.utils.import("resource://gre/modules/Task.jsm");
+Components.utils.import("chrome://tbsync/content/tbsync.jsm");
 
 /*
     The contact sidebar is loaded inside a browser element. That load is not seen by the windowlistener and thus overlays are not injected.
     The load is triggered/indicated by setting the src attribute of the browser -> mutation observer and delayed inject
 */
 
-tbSync.onInjectIntoMessengerCompose = function (window) {
-    // Create the MutationObserver: try to inject after the src attribute of the sidebar browser has been changed, thus the URL has been loaded
-    tbSync.messengerComposeObserver = new MutationObserver(function(mutations) {
-      mutations.forEach(function(mutation) {
-          tbSync.messengerComposeObserverTimer = window.setInterval(function(){    
-                let targetWindow = window.document.getElementById("sidebar").contentWindow.wrappedJSObject;
-                if (targetWindow) {
-                    window.clearInterval(tbSync.messengerComposeObserverTimer);
-                    if (tbSync.overlayManager.hasRegisteredOverlays(targetWindow)) {
-                        targetWindow.tbSync = tbSync;
+var tbSyncMessengerCompose = {
+
+    onInject: function (window) {
+        // Create the MutationObserver: try to inject after the src attribute of the sidebar browser has been changed, thus the URL has been loaded
+        tbSyncMessengerCompose.mObserver = new MutationObserver(function(mutations) {
+            mutations.forEach(function(mutation) {
+                tbSyncMessengerCompose.timer = window.setInterval(function(){    
+                    let targetWindow = window.document.getElementById("sidebar").contentWindow.wrappedJSObject;
+                    if (targetWindow) {
+                        window.clearInterval(tbSyncMessengerCompose.timer);
                         tbSync.overlayManager.injectAllOverlays(targetWindow);
-                    }                        
-                }
-            }, 1000);  
-      });    
-    });     
-     
-    tbSync.messengerComposeObserver.observe(window.document.getElementById("sidebar"), { attributes: true, childList: false, characterData: false });
-    
-    // Add autoComplete for TbSync
-    if (window.document.getElementById("addressCol2#1")) {
-        let autocompletesearch = window.document.getElementById("addressCol2#1").getAttribute("autocompletesearch");
-        if (autocompletesearch.indexOf("tbSyncAutoCompleteSearch") == -1) {
-            window.document.getElementById("addressCol2#1").setAttribute("autocompletesearch", autocompletesearch + " tbSyncAutoCompleteSearch");
-        }
-    }    
-}
+                    }
+                }, 1000);  
+            });    
+        });     
+         
+        tbSyncMessengerCompose.mObserver.observe(window.document.getElementById("sidebar"), { attributes: true, childList: false, characterData: false });
+        
+        // Add autoComplete for TbSync
+        if (window.document.getElementById("addressCol2#1")) {
+            let autocompletesearch = window.document.getElementById("addressCol2#1").getAttribute("autocompletesearch");
+            if (autocompletesearch.indexOf("tbSyncAutoCompleteSearch") == -1) {
+                window.document.getElementById("addressCol2#1").setAttribute("autocompletesearch", autocompletesearch + " tbSyncAutoCompleteSearch");
+            }
+        }    
+    },
 
-tbSync.onRemoveFromMessengerCompose = function (window) {
-    let targetWindow = window.document.getElementById("sidebar").contentWindow.wrappedJSObject;
-    if (tbSync.overlayManager.hasRegisteredOverlays(targetWindow)) {
+    onRemove: function (window) {
+        let targetWindow = window.document.getElementById("sidebar").contentWindow.wrappedJSObject;
         tbSync.overlayManager.removeAllOverlays(targetWindow);
-    }                        
-    tbSync.messengerComposeObserver.disconnect();
-    
-    // Remove autoComplete for TbSync
-    if (window.document.getElementById("addressCol2#1")) {
-        let autocompletesearch = window.document.getElementById("addressCol2#1").getAttribute("autocompletesearch").replace("tbSyncAutoCompleteSearch", "");
-        window.document.getElementById("addressCol2#1").setAttribute("autocompletesearch", autocompletesearch.trim());
+        tbSyncMessengerCompose.mObserver.disconnect();
+        
+        // Remove autoComplete for TbSync
+        if (window.document.getElementById("addressCol2#1")) {
+            let autocompletesearch = window.document.getElementById("addressCol2#1").getAttribute("autocompletesearch").replace("tbSyncAutoCompleteSearch", "");
+            window.document.getElementById("addressCol2#1").setAttribute("autocompletesearch", autocompletesearch.trim());
+        }
     }
 }
diff -Nru tbsync-1.5/content/overlays/messengercompose.xul tbsync-1.7/content/overlays/messengercompose.xul
--- tbsync-1.5/content/overlays/messengercompose.xul	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/overlays/messengercompose.xul	2019-02-26 16:25:49.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <overlay 
-	id="messengerComposeOverlay" 
-	oninject="tbSync.onInjectIntoMessengerCompose(window)"
-	onremove="tbSync.onRemoveFromMessengerCompose(window)"
+	id="TbSyncMessengerComposeOverlay" 
+	oninject="tbSyncMessengerCompose.onInject(window)"
+	onremove="tbSyncMessengerCompose.onRemove(window)"
 	xmlns:html="http://www.w3.org/1999/xhtml">
 
    <script type="application/javascript" src="chrome://tbsync/content/overlays/messengercompose.js" />
diff -Nru tbsync-1.5/content/overlays/messenger.js tbsync-1.7/content/overlays/messenger.js
--- tbsync-1.5/content/overlays/messenger.js	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/overlays/messenger.js	2019-02-26 16:25:49.000000000 +0000
@@ -9,34 +9,36 @@
  "use strict";
 
 Components.utils.import("resource://gre/modules/Services.jsm");
+Components.utils.import("chrome://tbsync/content/tbsync.jsm");
 
 var tbSyncMessenger = {
 
-    onInjectIntoMessenger: function (window) {
+    onInject: function (window) {
         Services.obs.addObserver(tbSyncMessenger.updateSyncstateObserver, "tbsync.updateSyncstate", false);
     },
 
-    onRemoveFromMessenger: function (window) {
+    onRemove: function (window) {
         Services.obs.removeObserver(tbSyncMessenger.updateSyncstateObserver, "tbsync.updateSyncstate");
     },
     
     updateSyncstateObserver: {
         observe: function (aSubject, aTopic, aData) {
             let account = aData;            
-            let syncstate = tbSync.getSyncData(account,"syncstate");
-            if (syncstate == "accountdone") {
-                let status = tbSync.db.getAccountSetting(account, "status");
-                switch (status) {
-                    case "401":
-                        //only popup one password prompt window
-                        if (!tbSync.passWindowObj.hasOwnProperty[account] || tbSync.passWindowObj[account] === null) {
-                            tbSync.passWindowObj[account] = tbSync.window.openDialog("chrome://tbsync/content/manager/password.xul", "passwordprompt", "centerscreen,chrome,resizable=no", tbSync.db.getAccount(account), function() {tbSync.syncAccount("sync", account);});
-                        }
-                        break;
+            if (account) {
+                let syncstate = tbSync.getSyncData(account, "syncstate");
+                if (syncstate == "accountdone") {
+                    let status = tbSync.db.getAccountSetting(account, "status");
+                    switch (status) {
+                        case "401":
+                            //only popup one password prompt window
+                            if (!tbSync.passWindowObj.hasOwnProperty[account] || tbSync.passWindowObj[account] === null) {
+                                tbSync.passWindowObj[account] = tbSync.window.openDialog("chrome://tbsync/content/manager/password.xul", "passwordprompt", "centerscreen,chrome,resizable=no", tbSync.db.getAccount(account), function() {tbSync.syncAccount("sync", account);});
+                            }
+                            break;
+                    }
                 }
             }
         }
-    },
-    
-    
+    }
+
 };
diff -Nru tbsync-1.5/content/overlays/messenger.xul tbsync-1.7/content/overlays/messenger.xul
--- tbsync-1.5/content/overlays/messenger.xul	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/overlays/messenger.xul	2019-02-26 16:25:49.000000000 +0000
@@ -2,9 +2,9 @@
 <!DOCTYPE window SYSTEM "chrome://tbsync/locale/tbSync.dtd">
 
 <overlay 
-    id="messengeroverlay" 
-    oninject="tbSyncMessenger.onInjectIntoMessenger(window)"
-    onremove="tbSyncMessenger.onRemoveFromMessenger(window)"
+    id="TbSyncMessengerOverlay" 
+    oninject="tbSyncMessenger.onInject(window)"
+    onremove="tbSyncMessenger.onRemove(window)"
     xmlns:html="http://www.w3.org/1999/xhtml">
 
     <script type="application/javascript" src="chrome://tbsync/content/overlays/messenger.js" />
diff -Nru tbsync-1.5/content/tbsync.jsm tbsync-1.7/content/tbsync.jsm
--- tbsync-1.5/content/tbsync.jsm	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/content/tbsync.jsm	2019-02-26 16:25:49.000000000 +0000
@@ -20,7 +20,8 @@
 Components.utils.import("resource://gre/modules/Task.jsm");
 Components.utils.import("resource://gre/modules/AddonManager.jsm");
 Components.utils.import("resource://gre/modules/NetUtil.jsm");
-Components.utils.import("resource:///modules/mailServices.js")
+Components.utils.import("resource:///modules/mailServices.js");
+Components.utils.import("chrome://tbsync/content/OverlayManager.jsm");
 Components.utils.importGlobalProperties(["XMLHttpRequest"]);
 
 
@@ -31,7 +32,7 @@
 
     enabled: false,
     window: null,
-    
+
     lightning: null,
     cardbook: null,
     addon: null,
@@ -85,23 +86,20 @@
         Services.obs.addObserver(tbSync.syncstateObserver, "tbsync.updateSyncstate", false);
         Services.obs.addObserver(tbSync.syncstateObserver, "tbsync.init.done", false);
 
-        // Inject UI before init finished, to give user the option to see Oops message and report bug
+        tbSync.overlayManager = new OverlayManager({verbose: 0});
         yield tbSync.overlayManager.registerOverlay("chrome://messenger/content/messenger.xul", "chrome://tbsync/content/overlays/messenger.xul");        
         yield tbSync.overlayManager.registerOverlay("chrome://messenger/content/messengercompose/messengercompose.xul", "chrome://tbsync/content/overlays/messengercompose.xul");
+        yield tbSync.overlayManager.registerOverlay("chrome://calendar/content/calendar-event-dialog-attendees.xul", "chrome://tbsync/content/overlays/calendar-event-dialog-attendees.xul");
         yield tbSync.overlayManager.registerOverlay("chrome://messenger/content/addressbook/addressbook.xul", "chrome://tbsync/content/overlays/abServerSearch.xul");
         yield tbSync.overlayManager.registerOverlay("chrome://messenger/content/addressbook/abContactsPanel.xul", "chrome://tbsync/content/overlays/abServerSearch.xul");
-        yield tbSync.overlayManager.registerOverlay("chrome://messenger/content/addressbook/addressbook.xul", "chrome://tbsync/content/overlays/addressbookoverlay.xul");
-        yield tbSync.overlayManager.registerOverlay("chrome://messenger/content/addressbook/abEditCardDialog.xul", "chrome://tbsync/content/overlays/abCardWindow.xul");
-        yield tbSync.overlayManager.registerOverlay("chrome://messenger/content/addressbook/abNewCardDialog.xul", "chrome://tbsync/content/overlays/abCardWindow.xul");
-        
-        tbSync.overlayManager.injectAllOverlays(tbSync.window);
+        yield tbSync.overlayManager.registerOverlay("chrome://messenger/content/addressbook/addressbook.xul", "chrome://tbsync/content/overlays/addressbookiconsoverlay.xul");
+        yield tbSync.overlayManager.registerOverlay("chrome://messenger/content/addressbook/abNewCardDialog.xul", "chrome://tbsync/content/overlays/abNewCardIconsOverlay.xul");
 
         //print information about Thunderbird version and OS
         tbSync.dump(Services.appinfo.name, Services.appinfo.platformVersion + " on " + OS.Constants.Sys.Name);
 
         // load common subscripts into tbSync (each subscript will be able to access functions/members of other subscripts, loading order does not matter)
         tbSync.includeJS("chrome://tbsync/content/db.js");
-        tbSync.includeJS("chrome://tbsync/content/abServerSearch.js");
         tbSync.includeJS("chrome://tbsync/content/abAutoComplete.js");
 
         //init DB
@@ -144,6 +142,9 @@
         //was debug mode enabled during startuo?
         tbSync.debugMode = tbSync.prefSettings.getBoolPref("log.tofile");
         
+        //inject overlays
+        tbSync.overlayManager.startObserving();
+
         //enable TbSync
         tbSync.enabled = true;
 
@@ -184,14 +185,13 @@
 
             } catch (e) {
                 tbSync.dump("FAILED to load provider", provider);
-                throw e;
+                Components.utils.reportError(e);
             }
 
         }
     }),
 
-    unloadProviderAddon:  function (addonId) {
-        
+    unloadProviderAddon:  function (addonId) {        
         //unload all loaded providers of this provider add-on
         if (tbSync.loadedProviderAddOns.hasOwnProperty(addonId) ) {
             for (let i=0; i < tbSync.loadedProviderAddOns[addonId].providers.length; i++) {
@@ -203,14 +203,19 @@
                     tbSync[provider] = {};
                     delete tbSync.loadedProviders[provider];
                     Services.obs.notifyObservers(null, "tbsync.updateAccountsList", provider);                    
-                    Services.obs.notifyObservers(null, "tbsync.updateSyncstate", provider);
+                    Services.obs.notifyObservers(null, "tbsync.updateSyncstate", null);
                 }
             }
 
             //remove all traces
             delete tbSync.loadedProviderAddOns[addonId];
         }
-        
+    },
+    
+    unloadAllProviderAddons: function () {
+        for (let addonId in tbSync.loadedProviderAddOns) {
+            tbSync.unloadProviderAddon(addonId);
+        }
     },
     
 
@@ -218,6 +223,11 @@
         //cancel sync timer
         tbSync.syncTimer.cancel();
 
+        //unload overlays
+        tbSync.overlayManager.stopObserving();
+
+        tbSync.unloadAllProviderAddons();
+        
         //remove observer
         if (tbSync.enabled === true) {
             Services.obs.removeObserver(tbSync.syncstateObserver, "tbsync.updateSyncstate");
@@ -508,7 +518,7 @@
     },
 
     setTargetModified : function (folder) {
-        if (/*folder.status == "OK" && */ tbSync.isEnabled(folder.account)) {
+        if (!tbSync.isSyncing(folder.account) && tbSync.isEnabled(folder.account)) {
             tbSync.db.setAccountSetting(folder.account, "status", "notsyncronized");
             tbSync.db.setFolderSetting(folder.account, folder.folderID, "status", "modified");
             //notify settings gui to update status
@@ -982,15 +992,17 @@
             details: details
         };
     
-        if (syncdata && syncdata.account) {
-            entry.account = syncdata.account;
-            entry.provider = tbSync.db.getAccountSetting(syncdata.account, "provider");
-            entry.accountname = tbSync.db.getAccountSetting(syncdata.account, "accountname");
-            entry.foldername = (syncdata.folderID) ? tbSync.db.getFolderSetting(syncdata.account, syncdata.folderID, "name") : "";
-        } else {
-            if (syncdata.provider) entry.provider = syncdata.provider
-            if (syncdata.accountname) entry.accountname = syncdata.accountname
-            if (syncdata.foldername) entry.foldername = syncdata.foldername
+        if (syncdata) {
+            if (syncdata.account) {
+                entry.account = syncdata.account;
+                entry.provider = tbSync.db.getAccountSetting(syncdata.account, "provider");
+                entry.accountname = tbSync.db.getAccountSetting(syncdata.account, "accountname");
+                entry.foldername = (syncdata.folderID) ? tbSync.db.getFolderSetting(syncdata.account, syncdata.folderID, "name") : "";
+            } else {
+                if (syncdata.provider) entry.provider = syncdata.provider;
+                if (syncdata.accountname) entry.accountname = syncdata.accountname;
+                if (syncdata.foldername) entry.foldername = syncdata.foldername;
+            }
         }
 
         let localized = "";
@@ -1260,16 +1272,22 @@
                                 
                     //if this point is reached, either new card (no TBSYNCID), or moved card (old TBSYNCID) -> reset TBSYNCID 
                     //whatever happens, if this item has an entry in the changelog, it is not a new item added by the user
-                    if (itemStatus === null) {
-                        let provider = tbSync.db.getAccountSetting(folders[0].account, "provider");
-                        tbSync.setTargetModified(folders[0]);
-                        let newCardID = tbSync[provider].getNewCardID(aItem, folders[0]);
-                        tbSync.db.addItemToChangeLog(aParentDir.URI, newCardID, "added_by_user");
-                        
-                        //mailinglist aware property setter
-                        tbSync.setPropertyOfCard (aItem, "TBSYNCID", newCardID);
-                        aParentDir.modifyCard(aItem);
+                    // ^ THIS IS NOT TRUE!
+                    //          If a card is moved from one ab to another, it gets a "modified" notification 
+                    //          before it gets the "added" notification -> it has modified_by_user flag if this is reached!
+                    //          We must allow itemStatus !== null here as well
+                    let provider = tbSync.db.getAccountSetting(folders[0].account, "provider");
+                    tbSync.setTargetModified(folders[0]);
+                    //remove any changelog entries, if the card already had an ID and an entry
+                    if (cardId) {
+                        tbSync.db.removeItemFromChangeLog(aParentDir.URI, cardId);
                     }
+                    let newCardID = tbSync[provider].getNewCardID(aItem, folders[0]);
+                    tbSync.db.addItemToChangeLog(aParentDir.URI, newCardID, "added_by_user");
+                    
+                    //mailinglist aware property setter
+                    tbSync.setPropertyOfCard (aItem, "TBSYNCID", newCardID);
+                    aParentDir.modifyCard(aItem);
                 }
                 
             }
@@ -1434,7 +1452,7 @@
         
         // Get cached or new unique name for new address book
         let cachedName = tbSync.db.getFolderSetting(account, folderID, "targetName");                         
-        let testname = cachedName == "" ? folder.name + " (" + tbSync.db.getAccountSetting(account, "accountname") + ")" : cachedName;
+        let testname = cachedName == "" ? tbSync.db.getAccountSetting(account, "accountname") + " (" + folder.name + ")" : cachedName;
 
         let count = 1;
         let unique = false;
@@ -1461,8 +1479,11 @@
         let data = abManager.getDirectoryFromId(dirPrefId);
         if (data instanceof Components.interfaces.nsIAbDirectory && data.dirPrefId == dirPrefId) {
             tbSync[provider].onResetTarget(account, folderID);
-            tbSync.db.setFolderSetting(account, folderID, "target", data.URI); 
-            //tbSync.db.setFolderSetting(account, folderID, "targetName", newname); 
+            tbSync.db.setFolderSetting(account, folderID, "target", data.URI);
+            //tbSync.db.setFolderSetting(account, folderID, "targetName", newname);
+            data.setStringValue("tbSyncProvider", provider);
+            //notify about new created address book
+            Services.obs.notifyObservers(null, 'tbsync.addressbook.created', null)
             return true;
         }
         
@@ -1487,7 +1508,12 @@
 
             let foStream = Components.classes["@mozilla.org/network/file-output-stream;1"].createInstance(Components.interfaces.nsIFileOutputStream);
             foStream.init(file, 0x02 | 0x08 | 0x20, 0x180, 0); // write, create, truncate
-            let binary = atob(data.split(" ").join(""));
+            let binary = "";
+            try {
+                binary = atob(data.split(" ").join(""));
+            } catch (e) {
+                tbSync.dump("Failed to decode base64 string:", data);
+            }
             foStream.write(binary, binary.length);
             foStream.close();
 
diff -Nru tbsync-1.5/debian/changelog tbsync-1.7/debian/changelog
--- tbsync-1.5/debian/changelog	2019-02-09 14:25:31.000000000 +0000
+++ tbsync-1.7/debian/changelog	2019-02-26 18:56:33.000000000 +0000
@@ -1,3 +1,18 @@
+tbsync (1.7-1) unstable; urgency=medium
+
+  [ Mechtilde ]
+  * New upstream version 1.7
+  * improved debian/
+
+ -- Mechtilde Stehmann <mechtilde@debian.org>  Tue, 26 Feb 2019 19:56:33 +0100
+
+tbsync (1.6-1) UNRELEASED; urgency=medium
+
+  [ Mechtilde ]
+  * New upstream version 1.6
+
+ -- Mechtilde Stehmann <mechtilde@debian.org>  Mon, 25 Feb 2019 16:08:34 +0100
+
 tbsync (1.5-1) unstable; urgency=medium
 
   [ Mechtilde ]
diff -Nru tbsync-1.5/debian/compat tbsync-1.7/debian/compat
--- tbsync-1.5/debian/compat	2019-01-31 20:12:12.000000000 +0000
+++ tbsync-1.7/debian/compat	2019-02-26 18:34:42.000000000 +0000
@@ -1 +1 @@
-11
+12
diff -Nru tbsync-1.5/debian/control tbsync-1.7/debian/control
--- tbsync-1.5/debian/control	2019-02-09 14:08:27.000000000 +0000
+++ tbsync-1.7/debian/control	2019-02-26 18:38:04.000000000 +0000
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers@lists.alioth.debian.org>
 Uploaders: Mechtilde Stehmann <mechtilde@debian.org>
-Build-Depends: debhelper (>= 11), mozilla-devscripts,
-Standards-Version: 4.2.1
+Build-Depends: debhelper (>= 12), mozilla-devscripts,
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/webext-team/tbsync.git/
 Vcs-Browser: https://salsa.debian.org/webext-team/tbsync
 Homepage: https://github.com/jobisoft/TbSync
@@ -13,11 +13,11 @@
 Architecture: all
 Depends: ${misc:Depends}
  , ${xpi:Depends}
- , thunderbird (>= 52)
+ , thunderbird (>= 60)
  , lightning | xul-ext-lightning
 Recommends: ${xpi:Recommends}
- , webext-dav4tbsync
- , webext-eas4tbsync
+ , webext-dav4tbsync (>= 0.14)
+ , webext-eas4tbsync (>= 0.11)
 Provides: ${xpi:Provides}
 Enhances: ${xpi:Enhances}
 Breaks: ${xpi:Breaks}
diff -Nru tbsync-1.5/debian/copyright tbsync-1.7/debian/copyright
--- tbsync-1.5/debian/copyright	2019-01-31 20:12:26.000000000 +0000
+++ tbsync-1.7/debian/copyright	2019-02-26 18:35:34.000000000 +0000
@@ -3,14 +3,9 @@
 Source: https://github.com/jobisoft/TbSync
 
 Files: *
-Copyright: 2017-2018 john.bieling@gmx.de
+Copyright: 2017-2019 john.bieling@gmx.de
 License: GPL-2+
 
-Files: unused/calTbSyncCalendar.js
-Copyright: 2007 Ingo Mueller (thunderbirthday at ingomueller dot net)
-                                Philipp Kewisch mozilla@kewis.ch
-License: GPL-2+ or LGPL-2.1 or MPL-1.1
-
 Files: skin/tbsync.png
 Copyright: paomedia
 License: CC-BY-3.0
diff -Nru tbsync-1.5/debian/source/lintian-overrides tbsync-1.7/debian/source/lintian-overrides
--- tbsync-1.5/debian/source/lintian-overrides	2019-02-09 14:24:12.000000000 +0000
+++ tbsync-1.7/debian/source/lintian-overrides	2019-02-26 17:40:41.000000000 +0000
@@ -1,5 +1,5 @@
 #/usr/share/lintian/overrides/tbsync
-tbsync source: source-is-missing content/overlays/messenger.js line length is 269 characters (>256)
+tbsync source: source-is-missing content/overlays/messenger.js line length is 273 characters (>256)
 # Lintian complains: content/overlays/messenger.js in line 33
 # length is 269 characters (>256) 
 # This is source code
diff -Nru tbsync-1.5/install.rdf tbsync-1.7/install.rdf
--- tbsync-1.5/install.rdf	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/install.rdf	2019-02-26 16:25:49.000000000 +0000
@@ -9,7 +9,7 @@
         <em:unpack>false</em:unpack>
         <em:multiprocessCompatible>true</em:multiprocessCompatible>
         <em:name>TbSync</em:name>
-        <em:version>1.3.2</em:version>
+        <em:version>1.7</em:version>
         <em:description>TbSync is a central user interface to manage cloud accounts and to synchronize their contact, task and calendar information with Thunderbird.</em:description>
         <em:homepageURL>https://github.com/jobisoft/TbSync</em:homepageURL>
         <em:iconURL>chrome://tbsync/skin/tbsync.png</em:iconURL>
diff -Nru tbsync-1.5/Makebeta tbsync-1.7/Makebeta
--- tbsync-1.5/Makebeta	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/Makebeta	2019-02-26 16:25:49.000000000 +0000
@@ -20,14 +20,14 @@
 sed -i "s/%VERSION%/$version/g" "beta-release-channel-update.rdf"
 sed -i "s|%LINK%|$1/$3|g" "beta-release-channel-update.rdf"
 
-if [ $vlevels -gt 1 ]
-then
- echo "This is a beta release (will include updateURL)"
+#if [ $vlevels -gt 1 ]
+#then
+ echo "Releasing version $version via beta release channel (will include updateURL)"
  sed -i "s|    <Description about=\"urn:mozilla:install-manifest\">|    <Description about=\"urn:mozilla:install-manifest\">\n        <em:updateURL>$1/$4</em:updateURL>|g" "install.rdf"
  sed -i "s|</em:name>| [Beta Release Channel]</em:name>|g" "install.rdf"
-else
- echo "This is a stable release (will NOT include updateURL)"
-fi
+#else
+# echo "This is a stable release (will NOT include updateURL)"
+#fi
 
 cp beta-release-channel-update.rdf $2/$4
 
diff -Nru tbsync-1.5/README.md tbsync-1.7/README.md
--- tbsync-1.5/README.md	2019-02-08 16:43:08.000000000 +0000
+++ tbsync-1.7/README.md	2019-02-26 16:25:49.000000000 +0000
@@ -15,6 +15,10 @@
 
 Further details can be found in the [wiki](https://github.com/jobisoft/TbSync/wiki) of the TbSync project and in the [how-to-get-started guide](https://github.com/jobisoft/TbSync/wiki/How-to-get-started).
 
+If you like TbSync and want to support its development, please consider a donation.
+
+[![](https://www.paypalobjects.com/en_US/DK/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FL89EHHQZ2CFL&source=url)
+
 ## Translations and localizations
 
 * [Localization content best practices](https://developer.mozilla.org/en-US/docs/Mozilla/Localization/Localization_content_best_practices)