diff --git a/build/plugins.php b/build/plugins.php
index a15a5121d..39e6ea933 100755
--- a/build/plugins.php
+++ b/build/plugins.php
@@ -150,6 +150,12 @@ foreach (glob(ROOT_DIR . '/plugins/*', GLOB_NOSORT | GLOB_ONLYDIR) as $dir) {
 			ksort($manifest_item);
 			$manifest[$name] = $manifest_item;
 
+			foreach (glob("{$dir}/*.min.js") as $file) {
+				unlink($file);
+			}
+			foreach (glob("{$dir}/js/*.min.js") as $file) {
+				unlink($file);
+			}
 		} else {
 			echo "- {$name} {$version}\n";
 		}
diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js
index 228b4c502..3def2fda7 100644
--- a/dev/Model/FolderCollection.js
+++ b/dev/Model/FolderCollection.js
@@ -502,6 +502,7 @@ export class FolderModel extends AbstractModel {
 	 */
 	get fullNameHash() {
 		return this.fullName.replace(/[^a-z0-9._-]+/giu, b64EncodeJSONSafe);
+//		return this.fullName.replace(/\/+/g, b64EncodeJSONSafe);
 //		return /^[a-z0-9._-]+$/iu.test(this.fullName) ? this.fullName : b64EncodeJSONSafe(this.fullName);
 	}
 
diff --git a/dev/Storage/Client.js b/dev/Storage/Client.js
index 0afe98134..8ca294583 100644
--- a/dev/Storage/Client.js
+++ b/dev/Storage/Client.js
@@ -6,7 +6,7 @@ const
 		try {
 			const value = localStorage.getItem(CLIENT_SIDE_STORAGE_INDEX_NAME);
 			return value ? JSON.parse(value) : null;
-		} catch (e) {
+		} catch {
 			return null;
 		}
 	};
@@ -45,7 +45,7 @@ export function set(key, data) {
 	try {
 		localStorage.setItem(CLIENT_SIDE_STORAGE_INDEX_NAME, JSON.stringify(storageResult));
 		return true;
-	} catch (e) {
+	} catch {
 		return false;
 	}
 }
@@ -57,7 +57,7 @@ export function set(key, data) {
 export function get(key) {
 	try {
 		return (getStorage() || {})['p' + key];
-	} catch (e) {
+	} catch {
 		return null;
 	}
 }
diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php
index 459172ebe..fecdc1c97 100644
--- a/plugins/avatars/index.php
+++ b/plugins/avatars/index.php
@@ -30,6 +30,7 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 		// https://github.com/the-djmaze/snappymail/issues/714
 		if ($this->Config()->Get('plugin', 'service', true)
 //		 || !$this->Config()->Get('plugin', 'delay', true)
+		 || $this->Config()->Get('plugin', 'contacts', false)
 		 || $this->Config()->Get('plugin', 'gravatar', false)
 		 || $this->Config()->Get('plugin', 'bimi', false)
 		 || $this->Config()->Get('plugin', 'favicon', false)
@@ -75,7 +76,8 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 		}
 		if (\is_array($mFrom)) {
 			if (/*!$this->Config()->Get('plugin', 'delay', true)
-			 && */($this->Config()->Get('plugin', 'gravatar', false)
+			 && */($this->Config()->Get('plugin', 'contacts', false)
+			    || $this->Config()->Get('plugin', 'gravatar', false)
 				|| ($this->Config()->Get('plugin', 'bimi', false) && 'pass' == $mFrom['dkimStatus'])
 				|| ($this->Config()->Get('plugin', 'favicon', false) && 'pass' == $mFrom['dkimStatus'])
 			 )