diff --git a/build.bat b/build.bat
index 1b34aa37f..a84e273c3 100644
--- a/build.bat
+++ b/build.bat
@@ -8,6 +8,6 @@ pwsh -Command "(gc -en UTF8NoBOM manifest.json) -replace 'pre%oldRev%', 'pre%qui
 rem "C:\Program Files\7-Zip\7z" a -xr!.svn quickFolders.zip install.rdf chrome.manifest chrome defaults license.txt
 "C:\Program Files\7-Zip\7z" a -xr!.svn QuickFoldersWeb.zip manifest.json install.rdf chrome.manifest chrome defaults license.txt
 echo %quickFoldersRev% > revision.txt
-move QuickFolders*.xpi "..\..\Release\_Test Versions\4.20\"
+move QuickFolders*.xpi "..\..\Release\_Test Versions\4.21\"
 pwsh -Command "Start-Sleep -m 150"
-rename QuickFoldersWeb.zip QuickFolders-wx-4.20pre%quickFoldersRev%.xpi
\ No newline at end of file
+rename QuickFoldersWeb.zip QuickFolders-wx-4.21pre%quickFoldersRev%.xpi
\ No newline at end of file
diff --git a/chrome/content/options.js b/chrome/content/options.js
index e202724ee..33464d31b 100644
--- a/chrome/content/options.js
+++ b/chrome/content/options.js
@@ -249,12 +249,13 @@ QuickFolders.Options = {
 					QI = QuickFolders.Interface,
 					options = QuickFolders.Options,
 					licenser = util.Licenser;
+    let isOptionsTab = window.arguments && window.arguments.length>1;
 					
 		util.logDebug("QuickFolders.Options.load()");
 		
 		if (prefs.isDebugOption('options')) debugger;
     // version number must be copied over first!
-		if (window.arguments && window.arguments[1].inn.instance) {
+		if (isOptionsTab && window.arguments[1].inn.instance) {
 			// QuickFolders = window.arguments[1].inn.instance; // avoid creating a new QuickFolders instance, reuse the one passed in!!
 			util.mExtensionVer = window.arguments[1].inn.instance.Util.Version;
 		}
@@ -265,12 +266,26 @@ QuickFolders.Options = {
 		if (!version) debugger;
 		
     util.logDebugOptional('options', 'QuickFolders.Options.load()');
-		if (window.arguments) {
+    let modeNum = -1;
+		if (isOptionsTab) {
 			try {
 				this.optionsMode = window.arguments[1].inn.mode;
 				// force selection of a certain pane (-1 ignores)
-				if (this.optionsMode >= 0)
-					prefs.setIntPref('lastSelectedOptionsTab', this.optionsMode);
+        if (this.optionsMode) {
+          switch (this.optionsMode) {
+            case "helpOnly":
+              modeNum = this.QF_PREF_HELP;
+              break;
+            case "supportOnly":
+              modeNum = this.QF_PREF_SUPPORT;
+              break;
+            case "licenseKey":
+              modeNum = this.QF_PREF_LICENSE;
+              break;
+        }
+			}
+				if (modeNum >= 0)
+					prefs.setIntPref('lastSelectedOptionsTab', modeNum);
 			}
 			catch(e) {;}
     }
diff --git a/chrome/content/qf-advancedTab.js b/chrome/content/qf-advancedTab.js
index 12b1fcbca..b4efb2b1b 100644
--- a/chrome/content/qf-advancedTab.js
+++ b/chrome/content/qf-advancedTab.js
@@ -95,7 +95,7 @@ QuickFolders.AdvancedTab = {
       iUnread.checked = (entry.flags & ADVANCED_FLAGS.SETMAIL_UNREAD) && true;
       
       elem('txtColor').value = entry.cssColor || '';
-      elem('txtColorPicker').color = elem('txtColor').value;
+      elem('txtColorPicker').value = elem('txtColor').value;
       elem('txtBackground').value = entry.cssBack || '';
       // custom palette
       let isPalette = (entry.flags & ADVANCED_FLAGS.CUSTOM_PALETTE) && true;
@@ -338,7 +338,7 @@ QuickFolders.AdvancedTab = {
   
   updatePicker: function updatePicker(textbox) {
     if (textbox.length) {
-      document.getElementById('txtColorPicker').color = textbox.value;
+      document.getElementById('txtColorPicker').value = textbox.value;
     }
   } ,
   
diff --git a/chrome/content/quickfolders-advanced-tab-props.xul b/chrome/content/quickfolders-advanced-tab-props.xul
index 3a280d8f9..28e2b46f3 100644
--- a/chrome/content/quickfolders-advanced-tab-props.xul
+++ b/chrome/content/quickfolders-advanced-tab-props.xul
@@ -19,6 +19,7 @@
 	buttonlabelextra2="&btnReset;"
 	buttonlabelextra1="&btnApply;"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  xmlns:html="http://www.w3.org/1999/xhtml"
 	onload="QuickFolders.AdvancedTab.load();"
 >
 	<script type="application/x-javascript" src="chrome://quickfolders/content/quickfolders.js" />
@@ -159,13 +160,14 @@
 							<textbox id="txtColor" 
 											 tooltiptext="&cssColor.tooltip;"
 											 onblur="QuickFolders.AdvancedTab.sanitizeCSS(this);QuickFolders.AdvancedTab.updatePicker(this);"/>
-							<colorpicker id="txtColorPicker" 
-											 type="button"
-											 onchange="return QuickFolders.AdvancedTab.pickColor(this.color);"/>
-							<spacer flex="1"/>
-							<label id="cssPreview" 
-										 value="Preview"
-										 tooltiptext="Current selected folder colors will always override this."/>
+            <html:input 
+                id="txtColorPicker" 
+                type="color"
+                onchange="return QuickFolders.AdvancedTab.pickColor(this.value);"/>
+            <spacer flex="1"/>
+            <label id="cssPreview" 
+                   value="Preview"
+                   tooltiptext="Current selected folder colors will always override this."/>
 						</hbox>
 					</row>
 				</rows>
diff --git a/chrome/content/quickfolders-interface.js b/chrome/content/quickfolders-interface.js
index 769255b22..d50b53bc2 100644
--- a/chrome/content/quickfolders-interface.js
+++ b/chrome/content/quickfolders-interface.js
@@ -342,13 +342,6 @@ QuickFolders.Interface = {
         // Start iterating at the top of the hierarchy, that is, with the root
         // folders for every account.
 		    acctMgr = Cc["@mozilla.org/messenger/account-manager;1"].getService(Ci.nsIMsgAccountManager);
-		// Postbox only:
-		if (util.isLegacyIterator) {
-			for (let acct in fixIterator(acctMgr.accounts, Ci.nsIMsgAccount)) {
-				addIfRecent(acct.incomingServer.rootFolder);
-				checkSubFolders(acct.incomingServer.rootFolder);
-			}
-		}
 
 		recentFolders.sort(sorter);
 		return recentFolders;
@@ -1229,7 +1222,7 @@ QuickFolders.Interface = {
 			const separator = "==============================\n";
 			let f = 0, affected = 0;
 			util.logDebug(separator + "loading Dictionary…");
-			//let allFolders = util.allFoldersIterator(false);
+
 			util.logDebug(separator + "Iterating all folders…");
 			for (let folder of util.allFoldersIterator(false)) {
 				//let folder = allFolders[i];
@@ -1340,7 +1333,8 @@ QuickFolders.Interface = {
     return this._selectedCategories;
   } ,
   set currentActiveCategories(v) {
-		const util = QuickFolders.Util;
+		const util = QuickFolders.Util,
+          prefs = QuickFolders.Preferences;
     this._selectedCategories = v; // set menuitem value?
     let menulist = this.CategoryMenu,
         cats = v.split('|'),
@@ -1350,8 +1344,9 @@ QuickFolders.Interface = {
 				menulist.value = v;
 				// if multiple select, check all boxes
 				for (let i=0; i<menulist.itemCount; i++) {
-					let it = menulist.getItemAtIndex(i),
-							isSelected = (cats.includes(it.value));
+					let it = menulist.getItemAtIndex(i);
+          if (it.tagName!='menuitem') continue;
+					let isSelected = (cats.includes(it.value));
 					if (isSelected) {
 						txtDebug += 'Check menuitem: ' + it.value + '\n';
 						it.setAttribute('checked', isSelected); // check selected value
@@ -5011,7 +5006,10 @@ QuickFolders.Interface = {
         maxLevel--;
         f = f.parent;
 				
-        if (f.prettyName.toLowerCase().indexOf(ancestors[maxLevel])==0) {
+        // [issue 135] allow in-string search for parents using delimiters: - _ . and space!
+        let folderNameMatches = f.prettyName.toLowerCase().split(/[_ ]/);
+        // ignore 1-character matches
+        if (folderNameMatches.some(a => a.startsWith(ancestors[maxLevel]) && a.length>1)) {
 					// 1st (top level) match
 					if (!directParent) directParent = f;
 					
@@ -5034,7 +5032,9 @@ QuickFolders.Interface = {
 					directParent = null;
 			while (f && maxLevel) {
 				maxLevel--;
-				if (f.prettyName.toLowerCase().indexOf(ancestors[maxLevel])==0) {
+        // [issue 135] allow in-string search for children using delimiters: - _ . and space!
+        let folderNameMatches = f.prettyName.toLowerCase().split(/[-_. ]/);
+				if (folderNameMatches.some(a => a.startsWith(search))) {   
 					if (!directParent) directParent = folder;
 					if (maxLevel == 0) {
 						if (parentList.indexOf(directParent)<0) {
@@ -5108,25 +5108,7 @@ QuickFolders.Interface = {
 			parentCount = parentString.split("/").length + 1; // original entry for parent
     }
 		let isFiling = QuickFolders.quickMove.isActive;
-    /********* old jump point *********/
-		/*
-		// [Bug 26565] if 1 unique full match is found - without children!, we can automatically jump there
-		if (     (matches.length == 1) 
-			    && (!isFiling) && (matches[0].folder && !matches[0].folder.hasSubFolders)
-          && (matches[0].lname == searchString)      // one exact FULL match
-				|| (wordStartMatch(matches[0].lname) && forceFind)) // match starts with search string + [Enter] key was pressed
-       ) {
-			// go to folder
-			isSelected = QuickFolders_MySelectFolder(matches[0].uri);
-			if (matches[0].parentString)
-				QuickFolders.quickMove.rememberLastFolder(matches[0].uri, matches[0].parentString);
-      setTimeout(function() {
-        QuickFolders.Interface.tearDownSearchBox();
-      }, 400);
-      return; // ????
-		}
-		*/
-		
+
     // if quickMove is active we need to suppress matches from newsgroups (as we can't move mail to them)
 		// "parent/" no name given, only lists the direct children
 		// "parent/X" can it list grandchildren? It does, but shouldn't - test with "Addons/Qu"
@@ -5134,36 +5116,15 @@ QuickFolders.Interface = {
 		if (parentPos>0) maxParentLevel = 1; // no subfolders when SLASH is entered
 		
 		// multiple slashes?
-		let isLegacyIterator = util.isLegacyIterator;
-    if (isLegacyIterator) {
-			util.logDebugOptional("interface.findFolder", "Using old folder iterator for Platform=" + util.PlatformVersion);
-      let AF = util.allFoldersIterator(isFiling);
-			util.logDebugOptional("Assigned AllFolders = " + AF);
-      for (let fi=0; fi<AF.length; fi++) {
-        let folder = AF.queryElementAt(fi, Ci.nsIMsgFolder);
-        if (!isParentMatch(folder, parentString, maxParentLevel, parents)) continue;
-				addMatchingFolder(matches, folder);
-      }
-    }
-    else {
-			util.logDebugOptional("interface.findFolder", "Calling allFoldersMatch(" + isFiling + ", isParentMatch(), parent='" + parentString + "', " + maxParentLevel + ",...)");
-			util.allFoldersMatch(isFiling, isParentMatch, parentString, maxParentLevel, parents, addMatchingFolder, matches);		
-			util.logDebugOptional("interface.findFolder", "Got " + matches.length + " matches");
-		}
+    util.logDebugOptional("interface.findFolder", "Calling allFoldersMatch(" + isFiling + ", isParentMatch(), parent='" + parentString + "', " + maxParentLevel + ",...)");
+    util.allFoldersMatch(isFiling, isParentMatch, parentString, maxParentLevel, parents, addMatchingFolder, matches);		
+    util.logDebugOptional("interface.findFolder", "Got " + matches.length + " matches");
 			
 		// no parent matches - Add one for a folder without children.
 		if (!matches.length && parentPos>0) {
-			if (isLegacyIterator) {  // util.Application == 'Postbox'
-				let AF = util.allFoldersIterator(isFiling);
-				for (let fi=0; fi<AF.length; fi++) {
-					let folder = AF.queryElementAt(fi, Ci.nsIMsgFolder);
-					addIfMatch(folder, matches.parentString || parentString, parents);
-				}
-			}
-			else
-				for (let folder of util.allFoldersIterator(isFiling)) {
-					addIfMatch(folder, matches.parentString || parentString, parents);
-				}
+      for (let folder of util.allFoldersIterator(isFiling, true)) {
+        addIfMatch(folder, matches.parentString || parentString, parents);
+      }
 		}
 		util.logDebugOptional("interface.findFolder", "built list: " + matches.length + " matches found. Building menu…");
 		
@@ -6456,13 +6417,14 @@ QuickFolders.Interface = {
     const util = QuickFolders.Util,
 		      prefs = QuickFolders.Preferences;
 		try {
-			util.logDebugOptional ("interface","updateUserStyles()");
+			util.logDebugOptional ("interface.userStyles","updateUserStyles()");
 			// get MAIN STYLE SHEET
 			let styleEngine = QuickFolders.Styles,
 			    ss = this.getStyleSheet(styleEngine, 'quickfolders-layout.css', 'QuickFolderStyles');
           
 			if (!ss) return false;
-			
+
+			util.logDebugOptional ("interface.userStyles","Palette sheet");
 			// get PALETTE STYLE SHEET
 			let ssPalettes = this.getStyleSheet(styleEngine, QuickFolders.Interface.PaletteStyleSheet, 'QuickFolderPalettes');
       ssPalettes = ssPalettes ? ssPalettes : ss; // if this fails, use main style sheet.
@@ -6470,16 +6432,19 @@ QuickFolders.Interface = {
 			    tabStyle = prefs.ColoredTabStyle;
 			
 			if (prefs.isCssTransitions) {
+        util.logDebugOptional ("interface.userStyles","Css transitions");
 				styleEngine.setElementStyle(ss, '.quickfolders-flat toolbarbutton', 'transition-duration', '1s, 1s, 2s, 1s');
 				styleEngine.setElementStyle(ss, '.quickfolders-flat toolbarbutton', 'transition-property', 'color, background-color, border-radius, box-shadow');
 			}
 			else {
+        util.logDebugOptional ("interface.userStyles","Remove Css transitions");
 				styleEngine.removeElementStyle(ss, '.quickfolders-flat toolbarbutton', 'transition-duration');
 				styleEngine.removeElementStyle(ss, '.quickfolders-flat toolbarbutton', 'transition-property');
 			}
 
 			// =================
 			// FONT COLORS
+      util.logDebugOptional ("interface.userStyles","Font Colors");
 			let theColorString = prefs.getUserStyle("InactiveTab","color","black"),
 			    colActiveBG = prefs.getUserStyle("ActiveTab","background-color","Highlight"),
 					btnSelector = '.quickfolders-flat toolbarbutton';
@@ -6493,6 +6458,7 @@ QuickFolders.Interface = {
 
 			// =================
 			// CUSTOM RADIUS 
+      util.logDebugOptional ("interface.userStyles","Custom Radius");
 			let topRadius = "4px",
 			    bottomRadius = "0px";
 			if (prefs.getBoolPref("style.corners.customizedRadius")) {
@@ -6509,6 +6475,7 @@ QuickFolders.Interface = {
 			styleEngine.setElementStyle(ss, btnSelector, legacyRadius ? '-moz-border-radius-bottomright' : 'border-bottom-right-radius', bottomRadius, true);
 			
 			// QuickFolders Toolbar only
+      util.logDebugOptional ("interface.userStyles","main toolbar buttons");
 			let btnInToolbarSelector = '.quickfolders-flat .folderBarContainer toolbarbutton',
 			    buttonHeight = prefs.getIntPref('style.button.minHeight') + "px",
 			    topPadding =  prefs.getIntPref('style.button.paddingTop') + "px";
@@ -6520,6 +6487,7 @@ QuickFolders.Interface = {
 			// BORDERS & SHADOWS
 			// for full colored tabs color the border as well!
 			// but should only apply if background image is set!!
+      util.logDebugOptional ("interface.userStyles","shadow");
 			let SHADOW = util.isCSSShadow ? 'box-shadow' : '-moz-box-shadow';
 			if (prefs.getBoolPref("buttonShadows")) {
 				styleEngine.setElementStyle(ss, '.quickfolders-flat .folderBarContainer toolbarbutton', SHADOW,'1px -1px 3px -1px rgba(0,0,0,0.3)', true);
@@ -6536,6 +6504,7 @@ QuickFolders.Interface = {
 			styleEngine.setElementStyle(ss, '#QuickFolders-Toolbar.quickfolders-flat #QuickFolders-Folders-Pane','border-bottom-color', colActiveBG, true); // only in main toolbar!
 
 			let theInit = '';
+      util.logDebugOptional ("interface.userStyles","folder styles");
 			try {
 			  theInit = 'SelectedFolderStyle';
 				this.initSelectedFolderStyle(ss, ssPalettes, tabStyle);			
@@ -6551,6 +6520,7 @@ QuickFolders.Interface = {
 			}
 			
 			// TOOLBAR
+      util.logDebugOptional ("interface.userStyles","toolbar colors");
 			theColorString = prefs.getUserStyle("Toolbar","background-color","ButtonFace");
 			if (prefs.getBoolPref("transparentToolbar"))
 				theColorString = "transparent";
@@ -6571,6 +6541,7 @@ QuickFolders.Interface = {
       }
       
       // main toolbar position
+      util.logDebugOptional ("interface.userStyles","toolbar position");
       let ordinalGroup = prefs.getIntPref('toolbar.ordinalPosition') || 0;
       styleEngine.setElementStyle(ss,'#QuickFolders-Toolbar', '-moz-box-ordinal-group', ordinalGroup.toString());
 
@@ -7303,13 +7274,27 @@ QuickFolders.Interface = {
 					storedObj.userStyle.push(node);
 				}
 			}
+      
+      // [issue 115] store selection for background dropdown
+      const bgKey = 'currentFolderBar.background.selection';
+      let backgroundSelection = prefs.getStringPref(bgKey);
+      storedObj.layout.push({
+        key: 'extensions.quickfolders.' + bgKey, 
+        val: backgroundSelection, 
+        originalId: 'qfpa-CurrentFolder-Selection'} 
+      );
+      
 		}
 				
 		let prettifiedJson = JSON.stringify(storedObj, null, '  '); 
 		this.fileConfig('save', prettifiedJson, 'QuickFolders-Config');
+    util.logDebug("Configuration stored.");
 	} ,
 
 	loadConfig: function qf_loadConfig(preferences) {
+    const util = QuickFolders.Util,
+					prefs = QuickFolders.Preferences,
+					options = QuickFolders.Options;
 		function changePref(pref) {
 			let p = preferences.get(pref.key);
 			if (p) {
@@ -7349,14 +7334,21 @@ QuickFolders.Interface = {
           }
 				}
 			}
+      else {
+        switch(pref.key) {
+          case 'extensions.quickfolders.currentFolderBar.background.selection':
+            if (pref.val && prefs.getStringPref(pref.key) != pref.val) {
+              options.setCurrentToolbarBackground(pref.val, true);
+            }
+            break;
+          default:
+            util.logDebug("loadConfig - unhandled preference: " + pref.key);
+        }
+      }
 		}
 		function readData(dataString) {
 			const Cc = Components.classes,
 						Ci = Components.interfaces,
-						service = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch),
-						util = QuickFolders.Util,
-						prefs = QuickFolders.Preferences,
-						options = QuickFolders.Options,
             QI = QuickFolders.Interface;
 
 			try {
diff --git a/chrome/content/quickfolders-quickMove.js b/chrome/content/quickfolders-quickMove.js
index 03c84189e..78c96976a 100644
--- a/chrome/content/quickfolders-quickMove.js
+++ b/chrome/content/quickfolders-quickMove.js
@@ -66,6 +66,7 @@ QuickFolders.quickMove = {
 	// only pass this when search was done in the format parent/folder
   execute: function execute(targetFolderUri, parentName) {
     function showFeedback(actionCount, messageIdList, isCopy) {
+      const prefs = QuickFolders.Preferences;
       // show notification
       if (!actionCount) 
         return;
@@ -84,14 +85,14 @@ QuickFolders.quickMove = {
         let messageDb = fld.msgDatabase || null;
         if (messageDb && !isCopy) {
           // reusing the existing Tab didn't work so we close & re-open msg from the new location.
-          // let tab = (QuickFolders.Util.Application=='Thunderbird') ? tabmail.selectedTab : tabmail.currentTabInfo;
-          // currentTab.folderDisplay.selectMessage(msgHdr, true);
-          setTimeout( 
-            function() {
-              let msgHdr = messageDb.getMsgHdrForMessageID(theMessage);
-              util.logDebugOptional('quickMove', 'reopen mail in tab:' + msgHdr.mime2DecodedSubject );
-              QuickFolders.Util.openMessageTabFromHeader(msgHdr);
-            }, 1200);
+          // [issue 132] only reopen the moved mail if this option is enabled (default is false)
+          if (prefs.getBoolPref("quickMove.reopenMsgTabAfterMove"))
+	          setTimeout( 
+	            function() {
+	              let msgHdr = messageDb.getMsgHdrForMessageID(theMessage);
+	              util.logDebugOptional('quickMove', 'reopen mail in tab:' + msgHdr.mime2DecodedSubject );
+	              QuickFolders.Util.openMessageTabFromHeader(msgHdr);
+	            }, 1200);
         }
       }
 			if (!QuickFolders.quickMove.silent)
diff --git a/chrome/content/quickfolders-register.js b/chrome/content/quickfolders-register.js
index 5da492db8..7438f956f 100644
--- a/chrome/content/quickfolders-register.js
+++ b/chrome/content/quickfolders-register.js
@@ -283,7 +283,6 @@ QuickFolders.Licenser = {
     // short order process
     if (util.isDebug) debugger;
     let shortOrder,
-		    addQuery = '',
 				featureName = document.getElementById('referrer').value; // hidden field
     switch	(license_type) {
 			case 0:  // personal license
@@ -298,7 +297,6 @@ QuickFolders.Licenser = {
 				}
 				else
 					shortOrder = "https://sites.fastspring.com/quickfolders/instant/quickfoldersrenew";
-				// addQuery = "&renewal=" + encodeURI(prefs.getStringPref('LicenseKey'));
 				featureName = encodeURI(prefs.getStringPref('LicenseKey'));
 				// should we autoselect the correct email address?
 			  break;
@@ -307,18 +305,14 @@ QuickFolders.Licenser = {
     let firstName = document.getElementById('firstName').value,
         lastName = document.getElementById('lastName').value,
         email = document.getElementById('email').value,
+        addQuery = featureName ?  "&referrer=" + featureName : "",
         url = shortOrder 
             + "?contact_fname=" + firstName 
-            + "&contact_lname=" + lastName 
 						+ addQuery
+            + "&contact_lname=" + lastName 
             + "&contact_email=" + email;
         
-    let queryString = '';  // action=adds
-        
-    if (featureName) {
-      queryString = "&referrer=" + featureName;
-    }
-    util.openLinkInBrowser(null, url + queryString);
+    util.openLinkInBrowser(null, url);
     window.close();
   }  ,
 
diff --git a/chrome/content/quickfolders-util.js b/chrome/content/quickfolders-util.js
index c8f41197a..872a7d205 100644
--- a/chrome/content/quickfolders-util.js
+++ b/chrome/content/quickfolders-util.js
@@ -66,7 +66,7 @@ QuickFolders.Util = {
   _isCSSGradients: -1,
 	_isCSSRadius: -1,
 	_isCSSShadow: true,
-	HARDCODED_CURRENTVERSION : "4.20", // will later be overriden call to AddonManager
+	HARDCODED_CURRENTVERSION : "4.21", // will later be overriden call to AddonManager
 	HARDCODED_EXTENSION_TOKEN : ".hc",
 	ADDON_ID: "quickfolders@curious.be",
 	FolderFlags : {  // nsMsgFolderFlags
@@ -846,7 +846,8 @@ QuickFolders.Util = {
 	// change: let's pass back the messageList that was moved / copied
 	moveMessages: function moveMessages(targetFolder, messageUris, makeCopy) {
     const Ci = Components.interfaces,
-          util = QuickFolders.Util; 
+          util = QuickFolders.Util,
+          prefs = QuickFolders.Preferences; 
 		let step = 0;
     if (!messageUris) 
       return null;
@@ -917,6 +918,15 @@ QuickFolders.Util = {
         util.slideAlert("QuickFolders", 'Nothing to do: Message is already in folder: ' + targetFolder.prettyName);
         return null;
       }
+      
+      // [issue 132] Shift-M opens a new tab after moving the message...
+      // if we move the email and are in a single message window, we need to jump to the next unread mail first!
+      if (!makeCopy && QuickFolders.Interface.CurrentTabMode == "message") { 
+        // either go to the next mail... or close the tab
+        if (prefs.getBoolPref("quickMove.gotoNextUnreadAfterMove"))
+          goDoCommand('cmd_nextMsg');
+      }
+      
 			step = 5;
 			let cs = Components.classes["@mozilla.org/messenger/messagecopyservice;1"].getService(Ci.nsIMsgCopyService);
 			step = 6;
@@ -1613,14 +1623,6 @@ QuickFolders.Util = {
 		return this._isCSSGradients;
 	},
 	
-	// use legacy iterator code
-	get isLegacyIterator() {
-		const util = QuickFolders.Util;
-		if (util.PlatformVersion<13 && util.ApplicationName != 'Interlink')
-			return true;
-		return false;
-	} ,
-	
 	aboutHost: function aboutHost() {
 		const util = QuickFolders.Util;
 		let txt = "App: " + util.Application + " " + util.ApplicationVersion + "\n" + 
diff --git a/chrome/content/quickfolders.js b/chrome/content/quickfolders.js
index 2810fe5ed..5e6de7e1e 100644
--- a/chrome/content/quickfolders.js
+++ b/chrome/content/quickfolders.js
@@ -398,7 +398,7 @@ END LICENSE BLOCK */
     ## changed support site links to https (secure) protocol
     ## Fixed: when restarting Thunderbird after an Add-on was installed Tabs from ALL categories were displayed.
     
-  4.20  QuickFolders Pro - WIP
+  4.20  QuickFolders Pro - 21/02/2021
     ## [issue 101]  If multiple categories are selected, closing QuickFolders settings reverts to "Show All"
     ## Fixed: When dragging mails on a subfolder item contained in a QuickFolders tab popup, the folder item 
        is shown with an underline. But all child folders were also displayed underlined.
@@ -411,6 +411,16 @@ END LICENSE BLOCK */
     ## [issue 112] Reading List menu - Add current Item not working
     
     
+  4.21 QuickFolders Pro - WIP
+    ## [issue 115] fix restoring of config values - support saving / restoring current folder bar background selection
+    ## [issue 117] Add color picker for text color in tab-specific properties
+    ## In QF Settings, make sure correct options tab is opened / remembered
+    ## [issue 132] In mail tab, quickMove reopens mail in new tab after moving - should go to next unread mail instead
+                   this behavior  is now disabled - see extensions.quickfolders.quickMove.reopenMsgTabAfterMove
+                   instead Tb will open the next unread mail - see extensions.quickfolders.quickMove.gotoNextUnreadAfterMove
+    
+  
+    
 	Future Work
 	===========
   
@@ -1568,7 +1578,7 @@ var QuickFolders = {
               let node = dragSession.sourceNode;
 
               // find out whether drop target button is right or left from source button:
-              if (node.hasAttributes()) {
+              if (node && node.attributes.length > 0) {
                 // check previous siblings to see if target button is found - then it's to the left. otherwise it's to the right
                 let i = null,
                     sib = node;
@@ -1818,8 +1828,7 @@ var QuickFolders = {
           QI = QuickFolders.Interface,
           prefs = QuickFolders.Preferences,
 					Ci = Components.interfaces,
-					Cc = Components.classes;
-          
+					Cc = Components.classes;        
       if (!dragSession) dragSession = Cc["@mozilla.org/widget/dragservice;1"].getService(Ci.nsIDragService).getCurrentSession();
           
 			let isShift = evt.shiftKey,
@@ -1839,17 +1848,15 @@ var QuickFolders = {
 
 			switch (contentType) {
 				case  "text/x-moz-folder": 
-					if (!isShift) {
-            // [issue 75] support moving folders through quickMove
-            if (DropTarget.id && DropTarget.id =="QuickFolders-quickMove") {
-              isMoveFolderQuickMove = true;
-            }
-            else {
-              let sPrompt = util.getBundleString("qfMoveFolderOrNewTab", 
-                  "Please drag new folders to an empty area of the toolbar! If you want to MOVE the folder, please hold down SHIFT while dragging.");
-              util.alert(sPrompt);
-              break;
-            }
+          // [issue 75] support moving folders through quickMove
+          if (DropTarget.id && DropTarget.id =="QuickFolders-quickMove") {
+            isMoveFolderQuickMove = true;
+          }
+					if (!isShift && !isMoveFolderQuickMove) {
+            let sPrompt = util.getBundleString("qfMoveFolderOrNewTab", 
+                "Please drag new folders to an empty area of the toolbar! If you want to MOVE the folder, please hold down SHIFT while dragging.");
+            util.alert(sPrompt);
+            break;
 					}
 					// handler for dropping folders
 					try {
diff --git a/chrome/content/shim12/quickfolders-shim.js b/chrome/content/shim12/quickfolders-shim.js
index 39983e248..e90097892 100644
--- a/chrome/content/shim12/quickfolders-shim.js
+++ b/chrome/content/shim12/quickfolders-shim.js
@@ -57,6 +57,7 @@ QuickFolders.Util.allFoldersIterator = function allFoldersIterator(writable) {
 		allFolders = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
 		// accounts will be changed from nsIMutableArray to nsIArray Tb24 (Sm2.17)
 		for (let account of fixIterator(acctMgr.accounts, Ci.nsIMsgAccount)) {
+      if ((writable) && !account.canFileMessagesOnServer) continue;
 			if (account.rootFolder)
 				account.rootFolder.ListDescendents(allFolders);
 			for (let aFolder of fixIterator(allFolders, Ci.nsIMsgFolder)) {
diff --git a/defaults/preferences/quickfolders.js b/defaults/preferences/quickfolders.js
index 0ed18cc0a..18b17f060 100644
--- a/defaults/preferences/quickfolders.js
+++ b/defaults/preferences/quickfolders.js
@@ -36,14 +36,15 @@ pref("extensions.quickfolders.quickMove.Hotkey", 'M');
 pref("extensions.quickfolders.quickMove.Hotkey.Shift", true);
 pref("extensions.quickfolders.quickMove.lastFolderName","");
 pref("extensions.quickfolders.quickMove.autoFill",true);
-pref("extensions.quickfolders.quickMove.premium.silentMode", false);
+pref("extensions.quickfolders.quickMove.folderLabel", true);
+pref("extensions.quickfolders.quickMove.reopenMsgTabAfterMove", false);
+pref("extensions.quickfolders.quickMove.gotoNextUnreadAfterMove", true);
 pref("extensions.quickfolders.quickCopy.useHotkey", false);
 pref("extensions.quickfolders.quickCopy.Hotkey", 'T');
 pref("extensions.quickfolders.quickCopy.Hotkey.Shift", true);
 pref("extensions.quickfolders.skipFolder.useHotkey", false);
 pref("extensions.quickfolders.skipFolder.Hotkey", 'S');
 pref("extensions.quickfolders.skipFolder.Hotkey.Shift", true);
-pref("extensions.quickfolders.quickMove.folderLabel", true);
 pref("extensions.quickfolders.showToolIcon", true);
 pref("extensions.quickfolders.bookmarks.folderLabel", true);
 pref("extensions.quickfolders.bookmarks.showButton", true);
@@ -164,6 +165,7 @@ pref("extensions.quickfolders.debug.interface.buttonStyles", false);
 pref("extensions.quickfolders.debug.interface.findFolder", false);
 pref("extensions.quickfolders.debug.interface.currentFolderBar", false);
 pref("extensions.quickfolders.debug.interface.update",false);
+pref("extensions.quickfolders.debug.interface.userStyles", false);
 pref("extensions.quickfolders.debug.listeners.tabmail", false);
 pref("extensions.quickfolders.debug.listeners.folder", false);
 pref("extensions.quickfolders.debug.mailTabs", false);
@@ -244,6 +246,7 @@ pref("extensions.quickfolders.premium.categories.multiSelect",false);
 pref("extensions.quickfolders.premium.findFolder.maxParentLevel", 2);  // Bug 26088
 pref("extensions.quickfolders.premium.findFolder.maxPathItems", 3); // Bug 25991
 pref("extensions.quickfolders.premium.findFolder.folderPathDetail", 2); // Bug 25991
+pref("extensions.quickfolders.quickMove.premium.silentMode", false);
 /* popupProFeature( ) counts how often these features are used */
 pref("extensions.quickfolders.premium.advancedTabProperties.usage", 0);
 pref("extensions.quickfolders.premium.bookmarks.usage", 0);
diff --git a/install.rdf b/install.rdf
index acd7ee3e7..f805a0da3 100644
--- a/install.rdf
+++ b/install.rdf
@@ -13,7 +13,7 @@
    em:icon64URL="chrome://quickfolders/skin/ico/QF64x64.png"
    em:optionsURL="chrome://quickfolders/content/options.xul">
     <em:type>2</em:type>
-	  <em:version>4.20</em:version>
+	  <em:version>4.21</em:version>
     <em:homepageURL>https://quickfolders.mozdev.org/index.html</em:homepageURL>
     <em:targetApplication RDF:resource="rdf:#$Vsomz2"/>
     <em:targetApplication RDF:resource="rdf:#$Vsomt2"/>
diff --git a/manifest.json b/manifest.json
index 45dbd5897..8709bacb5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
   "manifest_version": 2,
   "name": "QuickFolders",
 	"description": "Bookmark your favorite mail folders in Thunderbird.",
-  "version": "4.20",
+  "version": "4.21",
   "developer": {
 	  "name": "Axel Grude",
     "url": "https://quickfolders.org/index.html"
diff --git a/release-notes.html b/release-notes.html
index e31ddba77..c8a10ca83 100644
--- a/release-notes.html
+++ b/release-notes.html
@@ -1,21 +1,21 @@
-Release 4.20
+Release 4.21
 
 This release backports some of the fixes that were also done in the new version for Thunderbird 78. If you want to get the latest features, I highly recommend updating Thunderbird to the current 78 release version.
 To support QuickFolders, <a href="http://sites.fastspring.com/quickfolders/product/quickfolders?referrer=atn-version-page">buy a license</a> or <a href="https://quickfolders.org/donate.html?referrer=atn-version-page">donate</a> to support the project.
 
 <b>Improvements</b>
 <ul>
-<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/82">[issue 82]</a> Improved sorting of search results during quickMove / quickJump.</li>
-<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/109">[issue 109]</a> Menu item Mark Messages read in Folder + subfolders not displayed as expected - it was only shown if the folder of the tab didn't have unread emails itself. This additional menu item that can be used to set subfolders read was only displayed if the actual folder of the tab itself had no unread emails, and only child folders had them. Configure this command in QuickFolders settings / Advanced / Menu Configuration / Mail Commands</li>
-<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/37">[issue 37]</a> When no match is found using the "/" in quickMove box, display "No matching parent folders!" instead of "..."</li></ul>
+<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/117">[issue 117]</a> Added color picker for text color in tab-specific properties.</li>
+<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/132">[issue 132]</a> In a single message tab, quickMove used to redisplay the mail after moving it with quickMove.
+This behavior has now been changed on request to go to the next unread email instead. It can be modified by editing the following configuration settings (the <a href="#5.5">Thunderbird 78 version</a> of QuickFolders has a dedicated User Interface):
+
+<tt>extensions.quickfolders.quickMove.reopenMsgTabAfterMove</tt>
+<tt>extensions.quickfolders.quickMove.gotoNextUnreadAfterMove</tt></li>
+<li>QuickFolders Settings, now makes sure that correct options tab is opened / remembered</li>
+</ul>
+
 
 <b>Bug Fixes</b>
 <ul>
-<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/101">[issue 101]</a> If multiple categories are selected, closing QuickFolders settings reverts to "Show All"</li>
-<li> Fixed: When dragging mails on a subfolder item contained in a QuickFolders tab popup, the folder item is shown with an underline. But all child folders were also displayed underlined.</li>
-<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/107">[issue 107]</a> Restoring general / layout Settings only works if option for restoring folders also active.</li>
-
-<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/92">[issue 92]</a> do not apply "To address" from advanced tab propertiues when replying to an email!</li>
-<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/110">[issue 110]</a> "Tab-specific Properties" overwrites <i>To</i> Address when clicking <i>Write</i> from Address Book.</li>
-<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/112">[issue 112]</a> Reading List menu - Add current Item not working. </li>
+<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/115">[issue 115]</a> Fixed restoring of config values. Some general / layout settings were not restored properly even when they were saved during backup.</li>
 </ul>
\ No newline at end of file