diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 21adcbc9d..1f5ed1023 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -273,7 +273,6 @@ curl_proxy_auth = ""
 force_https = Off
 custom_login_link = ""
 custom_logout_link = ""
-allow_external_login = Off
 http_client_ip_check_proxy = Off
 fast_cache_memcache_host = "127.0.0.1"
 fast_cache_memcache_port = 11211
@@ -290,5 +289,5 @@ dev_email = ""
 dev_password = ""
 
 [version]
-current = "2.20.6"
+current = "2.22.2"
 saved = "Fri, 30 Sep 2022 12:34:56 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b084107fd..f9c1d1058 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,358 @@
+## 2.22.2 – 2022-11-24
+
+### Added
+- Support cPanel #697
+
+
+## 2.22.1 – 2022-11-23
+
+### Added
+- AddressBookInterface::GetContactByEmail() to support sender image/avatar extension
+  [#115](https://github.com/the-djmaze/snappymail/pull/115)
+
+### Changed
+- All the attachment zone is not clickable, even if the cursor is a hand
+  [#691](https://github.com/the-djmaze/snappymail/pull/691)
+- Different approach for "update button duplicated in admin panel"
+  [#677](https://github.com/the-djmaze/snappymail/pull/677)
+- Better drag & drop solution for leftPanel
+
+### Fixed
+- The page does not change after batch deletion
+  [#684](https://github.com/the-djmaze/snappymail/pull/684)
+- Prevent domain uppercase issues found in
+  [#689](https://github.com/the-djmaze/snappymail/pull/689)
+- Login invalid response: VXNlcm5hbWU6CG
+  [#693](https://github.com/the-djmaze/snappymail/pull/693)
+
+
+## 2.21.4 – 2022-11-22
+
+### Added
+- Added domain matcher test for
+  [#689](https://github.com/the-djmaze/snappymail/pull/689)
+- Download all Attachments of selected Emails
+  [#361](https://github.com/the-djmaze/snappymail/pull/361)
+
+### Changed
+- Log current shortcuts scope for
+  [#690](https://github.com/the-djmaze/snappymail/pull/690)
+- CSS everything to be box-sizing: border-box;
+- Make messageview a bit larger so that it is the same height as the messagelist
+- Cleanup and rearrange some fontastic glyphs
+- Also show From email address by default
+  [#683](https://github.com/the-djmaze/snappymail/pull/683)
+
+### Fixed
+- Contact.display() returns [object Object]
+- When left panel disabled and drag messages, show it
+- Issue with admin domain connection type settings selectbox
+  [#689](https://github.com/the-djmaze/snappymail/pull/689)
+- Mobile View on cellphones: automatic scrolling not working near the visual keyboard
+  [#686](https://github.com/the-djmaze/snappymail/pull/686)
+- Unable to separate runtime from installation
+  [#685](https://github.com/the-djmaze/snappymail/pull/685)
+
+### Removed
+- Removed inline parameter of checkbox and select components
+
+
+## 2.21.3 – 2022-11-16
+
+### Added
+- Click on PGP KEY attachment opens "Import key" dialog
+
+### Changed
+- Increase visible reading area for small screens
+  [#672](https://github.com/the-djmaze/snappymail/pull/672)
+- Improved message spam score detailed view
+- Improved DAV connection logging
+
+### Fixed
+- Handling attachments MIME type / content-type
+- Message responsive resizing width/height of elements
+  [#678](https://github.com/the-djmaze/snappymail/pull/678)
+- Focus on textarea when creating a new plain text email
+  [#501](https://github.com/the-djmaze/snappymail/pull/501)
+- CardDav remove photos of my contacts when synchronizing
+  [#679](https://github.com/the-djmaze/snappymail/pull/679)
+
+### Removed
+- \MailSo\Mime\Enumerations\MimeType
+
+### Nextcloud
+- Use fontastic in Nextcloud Files selector dialog
+- Firefox < 98 dialogs
+  [#673](https://github.com/the-djmaze/snappymail/pull/673)
+
+## 2.21.2 – 2022-11-15
+
+### Added
+- Allow browser Spellchecker
+  [#574](https://github.com/the-djmaze/snappymail/pull/574)
+- Decode MIME charset of .EML attachments
+  [#662](https://github.com/the-djmaze/snappymail/pull/662)
+
+### Changed
+- Increase message visible text area
+  [#672](https://github.com/the-djmaze/snappymail/pull/672)
+- When copy/paste image use the raw data instead of clipboard HTML
+  [#654](https://github.com/the-djmaze/snappymail/pull/654)
+- When application.ini debug.enable is true, also debug js and css
+- JavaScript rl.setWindowTitle() renamed to rl.setTitle()
+
+### Removed
+- Message toggle fullscreen button which was only in mobile view
+
+### Nextcloud
+- Workaround Nextcloud calendar crashes
+  [#622](https://github.com/the-djmaze/snappymail/pull/622)
+  [#661](https://github.com/the-djmaze/snappymail/pull/661)
+- Added share public/internal file link
+  [#569](https://github.com/the-djmaze/snappymail/pull/569)
+
+
+## 2.21.1 – 2022-11-13
+
+### Fixed
+- Crypt crashes when Sodium not installed
+  [#641](https://github.com/the-djmaze/snappymail/pull/641)
+  [#657](https://github.com/the-djmaze/snappymail/pull/657)
+  [#663](https://github.com/the-djmaze/snappymail/pull/663)
+  [#664](https://github.com/the-djmaze/snappymail/pull/664)
+  [#668](https://github.com/the-djmaze/snappymail/pull/668)
+  [#669](https://github.com/the-djmaze/snappymail/pull/669)
+- Personalised favicon not working - default Snappymail favicon showing
+  [#665](https://github.com/the-djmaze/snappymail/pull/665)
+
+### Nextcloud
+- v23 ContentSecurityPolicy versions issue
+  [#666](https://github.com/the-djmaze/snappymail/pull/666)
+
+
+## 2.21.0 – 2022-11-11
+
+### Added
+- Put messagelist top bar buttons also in dropdown
+- Allow setting additional Sec-Fetch rules, as discussed by
+  [#585](https://github.com/the-djmaze/snappymail/pull/585)
+- Light/Dark favicon.svg
+  [#643](https://github.com/the-djmaze/snappymail/pull/643)
+- Allow an account name/label
+  [#571](https://github.com/the-djmaze/snappymail/pull/571)
+
+### Changed
+- Moved ServiceRemoteAutoLogin to plugin/extension
+- Moved ServiceExternalSso to plugin/extension
+- Moved ServiceExternalLogin to plugin/extension
+- Renamed ManageSieveClient to SieveClient
+- New Net/Imap/Smtp/Sieve Settings object system which allows
+  setting SSL options per domain and verify_certificate by default
+- Update plugins to use new Net/Imap/Smtp/Sieve Settings object
+- Removed message double-click to full screen
+  [#638](https://github.com/the-djmaze/snappymail/pull/638)
+
+### Fixed
+- ldap-identities-plugin by @cm-schl
+  [#647](https://github.com/the-djmaze/snappymail/pull/647)
+- OpenSSL v3 ciphers issue
+  [#641](https://github.com/the-djmaze/snappymail/pull/641)
+
+### Nextcloud
+- Style PopupsNextcloudFiles view
+- Link to internal files in composer
+
+
+## 2.20.6 – 2022-11-08
+
+### Fixed
+- ?admin login failed
+  [#642](https://github.com/the-djmaze/snappymail/pull/642)
+- Resolve PHP 8.2 Creation of dynamic property is deprecated
+
+
+## 2.20.5 – 2022-11-08
+
+### Nextcloud
+- Improved workaround for Nextcloud Content-Security-Policy bug
+  Safari [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  Edge [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  Reported [#35013](https://github.com/nextcloud/server/issues/35013)
+
+
+## 2.20.4 – 2022-11-07
+
+### Fixed
+- Nextcloud no-embed use iframe mode failed
+
+### Nextcloud
+- Workaround Nextcloud Content-Security-Policy bug
+  Safari [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  Edge [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  Reported [#35013](https://github.com/nextcloud/server/issues/35013)
+
+
+## 2.20.3 – 2022-11-07
+
+### Added
+- Throw decrypt errors
+  [#632](https://github.com/the-djmaze/snappymail/issues/632)
+
+### Changed
+- Better multiple WYSIWYG registration system (not finished)
+- Better handling of admin token cookie
+
+### Fixed
+- Cookie “name” has been rejected because it is already expired.
+  [#636](https://github.com/the-djmaze/snappymail/issues/636)
+- Content-Security-Policy 'strict-dynamic' was missing
+
+### Nextcloud
+- Better handling of Content-Security-Policy
+  [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  [#633](https://github.com/the-djmaze/snappymail/issues/633)
+- Nextcloud 23 Error Call to undefined method useStrictDynamic()
+  [#634](https://github.com/the-djmaze/snappymail/issues/634)
+- Use snappymail icon as favicon-mask.svg instead default nextcloud logo
+  [#635](https://github.com/the-djmaze/snappymail/issues/635)
+
+
+## 2.20.2 – 2022-11-05
+
+### Added
+- Add more search operators (i.e. copy lots of Gmail ones)
+  [#625](https://github.com/the-djmaze/snappymail/issues/625)
+
+### Changed
+- Some CSS borders to var(--border-color)
+
+### Fixed
+- pgpDecrypt() using MailVelope the decrypt message was not green
+- Shift + F in search bar resulted in forwarding message
+  [#624](https://github.com/the-djmaze/snappymail/issues/624)
+
+### Nextcloud
+- auto login mechanism not working anymore
+  [#627](https://github.com/the-djmaze/snappymail/issues/627)
+
+
+## 2.20.1 – 2022-11-04
+
+### Added
+- Added CSS --dialog-border-clr and --dialog-border-radius
+- Show lock (lock) glyph in messagelist for encrypted messages
+
+### Fixed
+- Decrypt failed when OpenPGP.js not loaded
+
+### Nextcloud
+- Now integrate with Nextcloud by default, but keep iframe option available
+- Better theme integration with Nextcloud
+- Use Nextcloud 18+ IEventDispatcher
+- Solve Nextcloud 25 CSS issues
+  [#620](https://github.com/the-djmaze/snappymail/issues/620)
+- PutinICS does is not working for all calendar events
+  [#622](https://github.com/the-djmaze/snappymail/issues/622)
+- Update readme by @cm-schl
+  [#617](https://github.com/the-djmaze/snappymail/issues/617)
+
+
+## 2.20.0 – 2022-11-03
+
+### Added
+- Strip mailchimp tracking
+
+### Changed
+- Use some PHP typed properties
+- Move bootstrap @less variables to CSS var()
+- Improved theme styling
+
+### Fixed
+- CSS --dropdown-menu-background-color should be --dropdown-menu-bg-color
+
+### Nextcloud
+- Disable Nextcloud Impersonate check due to login/logout complications
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+- Improved theme integration and be compatible with Breeze Dark
+
+
+## 2.19.7 – 2022-11-02
+
+### Added
+- Make it clear that you are on the admin panel login screen
+- Force PHP opcache_invalidate due to upgrade error reports "Missing version directory"
+
+### Fixed
+- Switching user (impersonate plugin) keeps old Email logged in
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+- PGP Decryption / Encryption Failures
+  [#600](https://github.com/the-djmaze/snappymail/issues/600)
+- Undefined constant "OCA\SnappyMail\Util\RAINLOOP_APP_LIBRARIES_PATH
+  [#601](https://github.com/the-djmaze/snappymail/issues/601)
+- Cannot access admin panel
+  [#602](https://github.com/the-djmaze/snappymail/issues/602)
+- Wont show my emails
+  [#604](https://github.com/the-djmaze/snappymail/issues/604)
+- Return type of MailSo\Base\StreamFilters\LineEndings::filter
+  [#610](https://github.com/the-djmaze/snappymail/issues/610)
+- Create .pgp directory was missing
+
+### Security
+- Logger leaked some passwords
+
+## 2.19.6 – 2022-10-31
+
+### Added
+- Put sign and encrypt options in composer dropdown menu and simplify te two existing buttons with a glyph
+- Filter scripts UI let user understand which filter is active
+  [#590](https://github.com/the-djmaze/snappymail/issues/590)
+
+### Fixed
+- Method 'GetRequest' not found in \MailSo\Base\Http
+  [#585](https://github.com/the-djmaze/snappymail/issues/585)
+
+### Changed
+- Base Domain setup enhancements
+- Cleanup MailSo MailClient using __call()
+- Domain settings handling and store as JSON instead of ini
+- Some JavaScript changes
+- When try to login IMAP/SMTP/SIEVE but STARTTLS is required, force STARTTLS
+- Embed admin panel into Nextcloud (with autologin, no need for separate login)
+- Don't set default_domain in Nextcloud when already set
+
+### Removed
+- Nextcloud dark mode, it is incomplete
+
+### Deprecated
+- nothing
+## 2.21.0 – 2022-11-11
+
+### Added
+- Put messagelist top bar buttons also in dropdown
+- Allow setting additional Sec-Fetch rules, as discussed by #585
+- Light/Dark favicon.svg #643
+- Allow an account name/label #571
+
+### Changed
+- Moved ServiceRemoteAutoLogin to plugin/extension
+- Moved ServiceExternalSso to plugin/extension
+- Moved ServiceExternalLogin to plugin/extension
+- Renamed ManageSieveClient to SieveClient
+- New Net/Imap/Smtp/Sieve Settings object system which allows
+  setting SSL options per domain and verify_certificate by default
+- Update plugins to use new Net/Imap/Smtp/Sieve Settings object
+- Removed message double-click to full screen #638
+
+### Fixed
+- ldap-identities-plugin by @cm-schl
+  [#647](https://github.com/the-djmaze/snappymail/pull/647)
+- OpenSSL v3 ciphers issue #641
+
+### Nextcloud
+- Style PopupsNextcloudFiles view
+- Link to internal files in composer
+
+
 ## 2.20.6 – 2022-11-08
 
 ### Fixed
diff --git a/README.md b/README.md
index 882a3c4fd..f9bc9a61e 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ Copyright (c) 2013 - 2022 RainLoop
 
 This fork of RainLoop has the following changes:
 
-* Privacy/GDPR friendly (no: Social, Gravatar, Facebook, Google, Twitter, DropBox, OwnCloud, X-Mailer)
+* Privacy/GDPR friendly (no: Social, Gravatar, Facebook, Google, Twitter, DropBox, X-Mailer)
 * Admin uses password_hash/password_verify
 * Auth failed attempts written to syslog
 * Added Fail2ban instructions
@@ -57,10 +57,11 @@ This fork of RainLoop has the following changes:
 * Removed background video support
 * Removed Sentry (Application Monitoring and Error Tracking Software)
 * Removed Spyc yaml
+* Removed OwnCloud
 * Replaced gulp-uglify with gulp-terser
 * CRLF => LF line endings
 * Embed boot.js and boot.css into index.html
-* Ongoing removal of old JavaScript code (things are native these days)
+* Removal of old JavaScript code (things are native these days)
 * Added modified [Squire](https://github.com/neilj/Squire) HTML editor as replacement for CKEditor
 * Updated [Sabre/VObject](https://github.com/sabre-io/vobject)
 * Split Admin specific JavaScript code from User code
@@ -105,7 +106,6 @@ Supported are:
 The result is faster and smaller download code (good for mobile networks).
 
 * Added dev/prototype.js for some additional features
-* boot.js without webpack overhead
 * Modified Jua.js to be without jQuery
 * Replaced Autolinker with simple https/email detection
 * Replaced momentToNode with proper HTML5 `<time>`
@@ -118,6 +118,7 @@ The result is faster and smaller download code (good for mobile networks).
 * Replaced simplestatemanager with CSS @media
 * Replaced inputosaurus with own code
 * Replaced keymaster with own shortcuts handler
+* Replaced OpenPGP.js v2 with OpenPGP.js v5
 * Removed ifvisible.js
 * Removed pikaday
 * Removed underscore
@@ -140,26 +141,26 @@ RainLoop 1.17 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.170.153	|   81.239	|
-|app.js          	|4.207.787	|  406.270	|
-|boot.js         	|  868.735	|    2.055	|
-|libs.js         	|  658.812	|  192.965	|
+|admin.js        	|2.170.153	|   82.419	|
+|app.js          	|4.207.787	|  407.238	|
+|boot.js         	|  868.735	|    1.989	|
+|libs.js         	|  658.812	|  193.075	|
 |sieve.js         	|        0	|   86.121	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  768.935	|
+|TOTAL           	|8.240.095	|  771.127	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  256.831	|   40.167	| 73.606	| 13.399	| 60.877  	| 12.006	|
-|app.min.js      	|  515.367	|  188.083	|139.456	| 62.512	|110.485  	| 53.609	|
-|boot.min.js     	|   84.659	|    1.261	| 26.998	|    776	| 23.643  	|    633	|
-|libs.min.js     	|  584.772	|   92.055	|180.901	| 34.113	|155.182  	| 30.641	|
+|admin.min.js    	|  256.831	|   40.933	| 73.606	| 13.575	| 60.877  	| 12.185	|
+|app.min.js      	|  515.367	|  188.830	|139.456	| 62.816	|110.485  	| 53.944	|
+|boot.min.js     	|   84.659	|    1.216	| 26.998	|    761	| 23.643  	|    614	|
+|libs.min.js     	|  584.772	|   92.084	|180.901	| 34.119	|155.182  	| 30.621	|
 |sieve.min.js     	|        0	|   41.926	|      0	| 10.484	|      0  	|  9.451	|
 |polyfills.min.js	|   32.837	|        0	| 11.406	|      0	| 10.175  	|      0	|
-|TOTAL user      	|1.217.635	|  281.399	|358.761	| 97.401	|299.485  	| 84.883	|
-|TOTAL user+sieve	|1.217.635	|  323.325	|358.761	|107.885	|299.485  	| 94.334	|
-|TOTAL admin     	|  959.099	|  133.483	|292.911	| 48.288	|249.877  	| 43.280	|
+|TOTAL user      	|1.217.635	|  282.130	|358.761	| 97.696	|299.485  	| 85.179	|
+|TOTAL user+sieve	|1.217.635	|  324.056	|358.761	|108.180	|299.485  	| 94.630	|
+|TOTAL admin     	|  959.099	|  134.233	|292.911	| 48.455	|249.877  	| 43.420	|
 
 For a user its around 70% smaller and faster than traditional RainLoop.
 
@@ -169,6 +170,7 @@ For a user its around 70% smaller and faster than traditional RainLoop.
 * Themes work in mobile mode
 * Bugfix invalid/conflicting css rules
 * Use flexbox
+* Use border-box
 * Split app.css to have separate admin.css
 * Remove oldschool 'float'
 * Remove unused css
@@ -187,12 +189,12 @@ For a user its around 70% smaller and faster than traditional RainLoop.
 
 |css/*       	|RainLoop	|Snappy   	|RL gzip	|SM gzip	|SM brotli	|
 |------------	|-------:	|------:	|------:	|------:	|--------:	|
-|app.css     	| 340.331	| 83.746	| 46.946	| 17.262	| 14.779	|
-|app.min.css 	| 274.947	| 67.483	| 39.647	| 15.311	| 13.365	|
+|app.css     	| 340.331	| 82.425	| 46.946	| 17.049	| 14.595	|
+|app.min.css 	| 274.947	| 66.502	| 39.647	| 15.049	| 13.221	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
-|admin.css    	|       	| 30.816	|       	|  6.939	|  6.028	|
-|admin.min.css	|       	| 24.969	|       	|  6.300	|  5.531	|
+|admin.css    	|       	| 29.807	|       	|  6.744	|  5.851	|
+|admin.min.css	|       	| 24.223	|       	|  6.142	|  5.397	|
 
 ### PGP
 RainLoop uses the old OpenPGP.js v2
diff --git a/build/cpanel.php b/build/cpanel.php
new file mode 100755
index 000000000..2718b75aa
--- /dev/null
+++ b/build/cpanel.php
@@ -0,0 +1,39 @@
+<?php
+echo "\x1b[33;1m === cPanel === \x1b[0m\n";
+
+$cpanel_destination = "{$destPath}snappymail-{$package->version}-cpanel.tar";
+
+@unlink($cpanel_destination);
+@unlink("{$cpanel_destination}.gz");
+
+$cpanel_tar = new PharData($cpanel_destination);
+
+$cpanel_tar->buildFromDirectory('./integrations/cpanel', "@integrations/cpanel/@");
+
+$cpanel_path = '/usr/local/cpanel/base/3rdparty/snappymail/';
+
+$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator('snappymail/v'), RecursiveIteratorIterator::SELF_FIRST);
+foreach ($files as $file) {
+	if (is_file($file)) {
+		$newFile = str_replace('\\', '/', $file);
+		$cpanel_tar->addFile($file, "{$cpanel_path}{$newFile}");
+	}
+}
+
+$cpanel_tar->addFile('.htaccess', "{$cpanel_path}.htaccess");
+//$cpanel_tar->addFile('_include.php', 'snappymail/app/_include.php');
+$cpanel_tar->addFile('README.md', "{$cpanel_path}README.md");
+$cpanel_tar->addFromString('VERSION', $package->version);
+
+$index = file_get_contents('index.php');
+$index = str_replace('0.0.0', $package->version, $index);
+$cpanel_tar->addFromString("{$cpanel_path}index.php", $index);
+
+$data = file_get_contents('dev/serviceworker.js');
+$cpanel_tar->addFromString("{$cpanel_path}serviceworker.js", $data);
+
+$cpanel_tar->compress(Phar::GZ);
+unlink($cpanel_destination);
+$cpanel_destination .= '.gz';
+
+echo "{$cpanel_destination} created\n";
diff --git a/dev/App/Abstract.js b/dev/App/Abstract.js
index 02d547c4e..7f925251f 100644
--- a/dev/App/Abstract.js
+++ b/dev/App/Abstract.js
@@ -36,9 +36,6 @@ export class AbstractApp {
 					createViewModel: (params, componentInfo) => {
 						params = params || {};
 						i18nToNodes(componentInfo.element);
-						if (params.inline) {
-							componentInfo.element.style.display = 'inline-block';
-						}
 						return new ClassObject(params);
 					}
 				}
diff --git a/dev/App/User.js b/dev/App/User.js
index 3edb406d6..37491cc8f 100644
--- a/dev/App/User.js
+++ b/dev/App/User.js
@@ -212,7 +212,7 @@ export class AppUser extends AbstractApp {
 
 	start() {
 		if (SettingsGet('Auth')) {
-			rl.setWindowTitle(i18n('GLOBAL/LOADING'));
+			rl.setTitle(i18n('GLOBAL/LOADING'));
 
 			SMAudio.notifications(!!SettingsGet('SoundNotification'));
 			NotificationUserStore.enabled(!!SettingsGet('DesktopNotifications'));
diff --git a/dev/Common/File.js b/dev/Common/File.js
index 9cf850106..acd5a370e 100644
--- a/dev/Common/File.js
+++ b/dev/Common/File.js
@@ -22,7 +22,8 @@ const
 		ics: 'text/calendar',
 		xml: 'text/xml',
 		json: app+'json',
-		asc: app+'pgp-signature',
+//		asc: app+'pgp-signature',
+//		asc: app+'pgp-keys',
 		p10: app+'pkcs10',
 		p7c: app+'pkcs7-mime',
 		p7m: app+'pkcs7-mime',
diff --git a/dev/Common/Globals.js b/dev/Common/Globals.js
index 22f4b4e94..cd53ff55a 100644
--- a/dev/Common/Globals.js
+++ b/dev/Common/Globals.js
@@ -18,8 +18,8 @@ export const
 	dropdowns = [],
 	dropdownVisibility = ko.observable(false).extend({ rateLimit: 0 }),
 
-	moveAction = ko.observable(false),
 	leftPanelDisabled = ko.observable(false),
+	toggleLeftPanel = () => leftPanelDisabled(!leftPanelDisabled()),
 
 	createElement = (name, attr) => {
 		let el = doc.createElement(name);
@@ -68,10 +68,4 @@ dropdownVisibility.subscribe(value => {
 	}
 });
 
-leftPanelDisabled.toggle = () => leftPanelDisabled(!leftPanelDisabled());
-leftPanelDisabled.subscribe(value => {
-	value && moveAction() && moveAction(false);
-	$htmlCL.toggle('rl-left-panel-disabled', value);
-});
-
-moveAction.subscribe(value => value && leftPanelDisabled() && leftPanelDisabled(false));
+leftPanelDisabled.subscribe(value => $htmlCL.toggle('rl-left-panel-disabled', value));
diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index 2ffa1edf4..427247b5a 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -229,32 +229,28 @@ export const
 
 //			if ('TABLE' === name || 'TD' === name || 'TH' === name) {
 			if (!oStyle.backgroundImage) {
-				value = oStyle.width;
-				if (hasAttribute('width')) {
-					if (!value) {
+				if ('TD' !== name && 'TH' !== name) {
+					// Make width responsive
+					if (hasAttribute('width')) {
 						value = getAttribute('width');
-						if (1 < pInt(value)) {
-							oStyle.width = value.includes('%') ? value : value + 'px';
-						}
+						oStyle.width = value.includes('%') ? value : value + 'px';
+						delAttribute('width');
 					}
-					delAttribute('width');
-				}
-				if (value && !value.includes('%')) {
-					oStyle.maxWidth = value;
-					if ('TD' !== name && 'TH' !== name) {
+					value = oStyle.removeProperty('width');
+					if (value) {
+						oStyle.maxWidth = value;
 						oStyle.width = '100%';
 					}
-				}
-				if (hasAttribute('height')) {
-					value = getAttribute('height');
-					if (pInt(value)) {
+					// Make height responsive
+					if (hasAttribute('height')) {
+						value = getAttribute('height');
 						oStyle.height = value.includes('%') ? value : value + 'px';
+						delAttribute('height');
+					}
+					value = oStyle.removeProperty('height');
+					if (value) {
+						oStyle.maxHeight = value;
 					}
-					delAttribute('height');
-				}
-				value = oStyle.removeProperty('height');
-				if (value && !value.includes('%')) {
-					oStyle.maxHeight = value;
 				}
 			}
 //			} else
diff --git a/dev/Common/UtilsUser.js b/dev/Common/UtilsUser.js
index c9813674d..d78bec7ed 100644
--- a/dev/Common/UtilsUser.js
+++ b/dev/Common/UtilsUser.js
@@ -1,7 +1,7 @@
 import { MessageFlagsCache } from 'Common/Cache';
 import { Notification } from 'Common/Enums';
 import { MessageSetAction, ComposeType/*, FolderType*/ } from 'Common/EnumsUser';
-import { doc, createElement, elementById, dropdowns, dropdownVisibility, SettingsGet } from 'Common/Globals';
+import { doc, createElement, elementById, dropdowns, dropdownVisibility, SettingsGet, leftPanelDisabled } from 'Common/Globals';
 import { plainToHtml } from 'Common/Html';
 import { getNotification } from 'Common/Translator';
 import { EmailModel } from 'Model/Email';
@@ -15,6 +15,8 @@ import Remote from 'Remote/User/Fetch';
 
 export const
 
+moveAction = ko.observable(false),
+
 dropdownsDetectVisibility = (() =>
 	dropdownVisibility(!!dropdowns.find(item => item.classList.contains('show')))
 ).debounce(50),
@@ -356,3 +358,6 @@ populateMessageBody = (oMessage, popup) => {
 		}, oMessage.folder, oMessage.uid);
 	}
 };
+
+leftPanelDisabled.subscribe(value => value && moveAction(false));
+moveAction.subscribe(value => value && leftPanelDisabled(false));
diff --git a/dev/Component/Checkbox.js b/dev/Component/Checkbox.js
index 68825468f..5d427c89c 100644
--- a/dev/Component/Checkbox.js
+++ b/dev/Component/Checkbox.js
@@ -7,7 +7,6 @@ export class CheckboxComponent {
 			: ko.observable(undefined === params.enable || !!params.enable);
 
 		this.label = params.label;
-		this.inline = params.inline;
 	}
 
 	click() {
diff --git a/dev/External/SquireUI.js b/dev/External/SquireUI.js
index 46b7e08d6..e7f6e5343 100644
--- a/dev/External/SquireUI.js
+++ b/dev/External/SquireUI.js
@@ -493,7 +493,12 @@ class SquireUI
 	}
 
 	focus() {
-		('plain' == this.mode ? this.plain : this.squire).focus();
+		if ('plain' == this.mode) {
+			this.plain.focus();
+			this.plain.setSelectionRange(0, 0);
+		} else {
+			this.squire.focus();
+		}
 	}
 }
 
diff --git a/dev/External/User/ko.js b/dev/External/User/ko.js
index 6bbaa5965..c20c06af9 100644
--- a/dev/External/User/ko.js
+++ b/dev/External/User/ko.js
@@ -2,7 +2,7 @@ import 'External/ko';
 import ko from 'ko';
 import { HtmlEditor } from 'Common/Html';
 import { timeToNode } from 'Common/Translator';
-import { doc, elementById, addEventsListeners, dropdowns } from 'Common/Globals';
+import { doc, elementById, addEventsListeners, dropdowns, leftPanelDisabled } from 'Common/Globals';
 import { dropdownsDetectVisibility } from 'Common/UtilsUser';
 import { EmailAddressesComponent } from 'Component/EmailAddresses';
 import { ThemeStore } from 'Stores/Theme';
@@ -144,6 +144,8 @@ Object.assign(ko.bindingHandlers, {
 
 					// Remove the Chrome visibility
 					dragImage.style.cssText = '';
+
+					leftPanelDisabled(false);
 				} else {
 					e.preventDefault();
 				}
diff --git a/dev/Knoin/AbstractViews.js b/dev/Knoin/AbstractViews.js
index 91be6625e..ac24d66ac 100644
--- a/dev/Knoin/AbstractViews.js
+++ b/dev/Knoin/AbstractViews.js
@@ -1,7 +1,7 @@
 import ko from 'ko';
 
 import { addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko';
-import { keyScope, addShortcut, SettingsGet, leftPanelDisabled, elementById } from 'Common/Globals';
+import { keyScope, addShortcut, SettingsGet, leftPanelDisabled, toggleLeftPanel, elementById } from 'Common/Globals';
 import { ViewTypePopup, showScreenPopup } from 'Knoin/Knoin';
 
 import { SaveSettingStatus } from 'Common/Enums';
@@ -97,6 +97,7 @@ export class AbstractViewLeft extends AbstractView
 	{
 		super(templateID, 'left');
 		this.leftPanelDisabled = leftPanelDisabled;
+		this.toggleLeftPanel = toggleLeftPanel;
 	}
 }
 
diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js
index 2a40c47f5..ba7ceca30 100644
--- a/dev/Knoin/Knoin.js
+++ b/dev/Knoin/Knoin.js
@@ -1,15 +1,16 @@
 import ko from 'ko';
 import { koComputable } from 'External/ko';
 import { doc, $htmlCL, elementById, fireEvent } from 'Common/Globals';
-import { forEachObjectValue, forEachObjectEntry } from 'Common/Utils';
+import { forEachObjectEntry } from 'Common/Utils';
 import { i18nToNodes } from 'Common/Translator';
 
 let
-	SCREENS = {},
 	currentScreen = null,
 	defaultScreenName = '';
 
 const
+	SCREENS = new Map,
+
 	autofocus = dom => dom.querySelector('[autofocus]')?.focus(),
 
 	visiblePopups = new Set,
@@ -18,7 +19,7 @@ const
 	 * @param {string} screenName
 	 * @returns {?Object}
 	 */
-	screen = screenName => (screenName && SCREENS[screenName]) || null,
+	screen = screenName => (screenName && SCREENS.get(screenName)) || null,
 
 	/**
 	 * @param {Function} ViewModelClass
@@ -35,8 +36,6 @@ const
 				dialog = ViewTypePopup === vm.viewType,
 				vmPlace = doc.getElementById(position);
 
-			fireEvent('rl-view-model.create', vm);
-
 			ViewModelClass.__builded = true;
 			ViewModelClass.__vm = vm;
 
@@ -53,6 +52,7 @@ const
 
 					// Firefox < 98 / Safari < 15.4 HTMLDialogElement not defined
 					if (!vmDom.showModal) {
+						vmDom.className = 'polyfill';
 						vmDom.showModal = () => {
 							vmDom.backdrop ||
 								vmDom.before(vmDom.backdrop = Element.fromHTML('<div class="dialog-backdrop"></div>'));
@@ -113,6 +113,8 @@ const
 					vmDom.addEventListener('transitionend', endShowHide);
 				}
 
+				fireEvent('rl-view-model.create', vm);
+
 				ko.applyBindingAccessorsToNode(
 					vmDom,
 					{
@@ -129,7 +131,7 @@ const
 			}
 		}
 
-		return ViewModelClass && ViewModelClass.__vm;
+		return ViewModelClass?.__vm;
 	},
 
 	forEachViewModel = (screen, fn) => {
@@ -157,11 +159,9 @@ const
 	 * @param {Function} ViewModelClassToHide
 	 * @returns {void}
 	 */
-	hideScreenPopup = ViewModelClassToHide => {
-		if (ViewModelClassToHide?.__vm && ViewModelClassToHide?.__dom) {
-			ViewModelClassToHide.__vm.modalVisible(false);
-		}
-	},
+	hideScreenPopup = ViewModelClassToHide =>
+		ViewModelClassToHide?.__vm && ViewModelClassToHide.__dom
+		&& ViewModelClassToHide.__vm.modalVisible(false),
 
 	/**
 	 * @param {string} screenName
@@ -208,9 +208,7 @@ const
 
 					setTimeout(() => {
 						// hide screen
-						if (currentScreen && !isSameScreen) {
-							hideScreen(currentScreen);
-						}
+						currentScreen && !isSameScreen && hideScreen(currentScreen);
 						// --
 
 						currentScreen = vmScreen;
@@ -267,21 +265,19 @@ export const
 	 */
 	startScreens = screensClasses => {
 		hasher.clear();
-		forEachObjectValue(SCREENS, screen => hideScreen(screen, 1));
-		SCREENS = {};
+		SCREENS.forEach(screen => hideScreen(screen, 1));
+		SCREENS.clear();
 		currentScreen = null,
 		defaultScreenName = '';
 
 		screensClasses.forEach(CScreen => {
-			if (CScreen) {
-				const vmScreen = new CScreen(),
-					screenName = vmScreen.screenName;
-				defaultScreenName || (defaultScreenName = screenName);
-				SCREENS[screenName] = vmScreen;
-			}
+			const vmScreen = new CScreen(),
+				screenName = vmScreen.screenName;
+			defaultScreenName || (defaultScreenName = screenName);
+			SCREENS.set(screenName, vmScreen);
 		});
 
-		forEachObjectValue(SCREENS, vmScreen => {
+		SCREENS.forEach(vmScreen => {
 			if (!vmScreen.__started) {
 				vmScreen.onStart();
 				vmScreen.__started = true;
diff --git a/dev/Mime/Parser.js b/dev/Mime/Parser.js
index 6ff0938f8..4a9cbaa65 100644
--- a/dev/Mime/Parser.js
+++ b/dev/Mime/Parser.js
@@ -1,8 +1,16 @@
 
 const
 	// RFC2045
-	QPDecodeIn = /=([0-9A-F]{2})/g,
-	QPDecodeOut = (...args) => String.fromCharCode(parseInt(args[1], 16));
+	QPDecodeParams = [/=([0-9A-F]{2})/g, (...args) => String.fromCharCode(parseInt(args[1], 16))],
+	QPDecode = data => data.replace(/=\r?\n/g, '').replace(...QPDecodeParams),
+	decodeText = (charset, data) => {
+		try {
+			// https://developer.mozilla.org/en-US/docs/Web/API/Encoding_API/Encodings
+			return new TextDecoder(charset).decode(Uint8Array.from(data, c => c.charCodeAt(0)));
+		} catch (e) {
+			console.error({charset:charset,error:e});
+		}
+	};
 
 export function ParseMime(text)
 {
@@ -40,22 +48,14 @@ export function ParseMime(text)
 
 		get body() {
 			let body = this.bodyRaw,
-//				charset = this.header('content-type')?.params.charset,
+				charset = this.header('content-type')?.params.charset,
 				encoding = this.headerValue('content-transfer-encoding');
 			if ('quoted-printable' == encoding) {
-				body = body.replace(/=\r?\n/g, '').replace(QPDecodeIn, QPDecodeOut);
+				body = QPDecode(body);
 			} else if ('base64' == encoding) {
 				body = atob(body.replace(/\r?\n/g, ''));
 			}
-/*
-			try {
-				// https://developer.mozilla.org/en-US/docs/Web/API/Encoding_API/Encodings
-				return new TextDecoder(charset).decode(Uint8Array.from(body, c => c.charCodeAt(0)));
-//				return new TextDecoder(charset).decode(new TextEncoder().encode(body));
-			} catch (e) {
-			}
-*/
-			return body;
+			return decodeText(charset, body);
 		}
 
 		get dataUrl() {
@@ -65,7 +65,7 @@ export function ParseMime(text)
 				body = body.replace(/\r?\n/g, '');
 			} else {
 				if ('quoted-printable' == encoding) {
-					body = body.replace(/=\r?\n/g, '').replace(QPDecodeIn, QPDecodeOut);
+					body = QPDecode(body);
 				}
 				body = btoa(body);
 			}
@@ -111,8 +111,12 @@ export function ParseMime(text)
 					[...header.matchAll(/;\s*([^;=]+)=\s*"?([^;"]+)"?/g)].forEach(param =>
 						params[param[1].trim().toLowerCase()] = param[2].trim()
 					);
+					// encoded-word = "=?" charset "?" encoding "?" encoded-text "?="
+					match[2] = match[2].trim().replace(/=\?([^?]+)\?(B|Q)\?(.+?)\?=/g, (m, charset, encoding, text) =>
+						decodeText(charset, 'B' == encoding ? atob(text) : QPDecode(text))
+					);
 					headers[match[1].trim().toLowerCase()] = {
-						value: match[2].trim(),
+						value: match[2],
 						params: params
 					};
 				}
diff --git a/dev/Model/ComposeAttachment.js b/dev/Model/ComposeAttachment.js
index 540d947c1..5b7798628 100644
--- a/dev/Model/ComposeAttachment.js
+++ b/dev/Model/ComposeAttachment.js
@@ -27,6 +27,7 @@ export class ComposeAttachmentModel extends AbstractModel {
 			fileName: fileName,
 			size: size,
 			tempName: '',
+			type: '', // application/octet-stream
 
 			progress: 0,
 			error: '',
@@ -54,7 +55,7 @@ export class ComposeAttachmentModel extends AbstractModel {
 				return null === localSize ? '' : FileInfo.friendlySize(localSize);
 			},
 
-			mimeType: () => FileInfo.getContentType(this.fileName()),
+			mimeType: () => this.type() || FileInfo.getContentType(this.fileName()),
 			fileExt: () => FileInfo.getExtension(this.fileName()),
 
 			iconClass: () => FileInfo.getIconClass(this.fileExt(), this.mimeType())
diff --git a/dev/Model/Contact.js b/dev/Model/Contact.js
index 9da333509..5b19fdcf2 100644
--- a/dev/Model/Contact.js
+++ b/dev/Model/Contact.js
@@ -119,7 +119,7 @@ export class ContactModel extends AbstractModel {
 
 			display: () => {
 				let a = this.fullName(),
-					b = this.email()?.[0]?.value,
+					b = this.email()?.[0]?.value(),
 					c = this.nickname();
 				return a || b || c;
 			}
diff --git a/dev/Screen/Admin/Login.js b/dev/Screen/Admin/Login.js
index 7d0301b2f..76b224d71 100644
--- a/dev/Screen/Admin/Login.js
+++ b/dev/Screen/Admin/Login.js
@@ -8,6 +8,6 @@ export class LoginAdminScreen extends AbstractScreen {
 	}
 
 	onShow() {
-		rl.setWindowTitle();
+		rl.setTitle();
 	}
 }
diff --git a/dev/Screen/Admin/Settings.js b/dev/Screen/Admin/Settings.js
index a57cc8219..95d024691 100644
--- a/dev/Screen/Admin/Settings.js
+++ b/dev/Screen/Admin/Settings.js
@@ -37,6 +37,6 @@ export class SettingsAdminScreen extends AbstractSettingsScreen {
 	}
 
 	onShow() {
-		rl.setWindowTitle();
+		rl.setTitle();
 	}
 }
diff --git a/dev/Screen/User/Login.js b/dev/Screen/User/Login.js
index c6282f67e..8865353bb 100644
--- a/dev/Screen/User/Login.js
+++ b/dev/Screen/User/Login.js
@@ -8,6 +8,6 @@ export class LoginUserScreen extends AbstractScreen {
 	}
 
 	onShow() {
-		rl.setWindowTitle();
+		rl.setTitle();
 	}
 }
diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js
index 5040305d7..f3e47823d 100644
--- a/dev/Screen/User/MailBox.js
+++ b/dev/Screen/User/MailBox.js
@@ -1,8 +1,8 @@
 import { Scope } from 'Common/Enums';
 import { Layout, ClientSideKeyNameMessageListSize } from 'Common/EnumsUser';
-import { doc, createElement, leftPanelDisabled, moveAction, Settings, elementById } from 'Common/Globals';
+import { doc, createElement, leftPanelDisabled, Settings, elementById } from 'Common/Globals';
 import { pString, pInt } from 'Common/Utils';
-import { setLayoutResizer } from 'Common/UtilsUser';
+import { setLayoutResizer, moveAction } from 'Common/UtilsUser';
 import { getFolderFromCacheList, getFolderFullName, getFolderInboxName } from 'Common/Cache';
 import { i18n, initOnStartOrLangChange } from 'Common/Translator';
 import { SettingsUserStore } from 'Stores/User/Settings';
@@ -46,7 +46,7 @@ export class MailBoxUserScreen extends AbstractScreen {
 		const count = Settings.app('listPermanentFiltered') ? 0 : FolderUserStore.foldersInboxUnreadCount(),
 			email = AccountUserStore.email();
 
-		rl.setWindowTitle(
+		rl.setTitle(
 			(email
 				? '' + (0 < count ? '(' + count + ') ' : ' ') + email + ' - '
 				: ''
diff --git a/dev/Screen/User/Settings.js b/dev/Screen/User/Settings.js
index b6d5116f7..69fcafe1b 100644
--- a/dev/Screen/User/Settings.js
+++ b/dev/Screen/User/Settings.js
@@ -72,6 +72,6 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
 
 	setSettingsTitle() {
 		const sEmail = AccountUserStore.email();
-		rl.setWindowTitle((sEmail ? sEmail + ' - ' :  '') + this.sSettingsTitle);
+		rl.setTitle((sEmail ? sEmail + ' - ' :  '') + this.sSettingsTitle);
 	}
 }
diff --git a/dev/Settings/Admin/Domains.js b/dev/Settings/Admin/Domains.js
index e248d7063..eb07332b2 100644
--- a/dev/Settings/Admin/Domains.js
+++ b/dev/Settings/Admin/Domains.js
@@ -11,10 +11,26 @@ import { DomainAliasPopupView } from 'View/Popup/DomainAlias';
 export class AdminSettingsDomains /*extends AbstractViewSettings*/ {
 	constructor() {
 		this.domains = DomainAdminStore;
-
+		this.username = ko.observable('');
 		this.domainForDeletion = ko.observable(null).askDeleteHelper();
 	}
 
+	testUsername() {
+		// TODO: find domain matching username
+		Remote.request('AdminDomainMatch',
+			(iError, oData) => {
+				if (oData?.Result?.domain) {
+					alert(`${oData.Result.domain.email} matched domain: ${oData.Result.domain.name}`);
+				} else {
+					alert('No domain match');
+				}
+			},
+			{
+				username: this.username()
+			}
+		);
+	}
+
 	createDomain() {
 		showScreenPopup(DomainPopupView);
 	}
diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js
index f5c4fec7b..f2e1430e6 100644
--- a/dev/Settings/User/General.js
+++ b/dev/Settings/User/General.js
@@ -42,8 +42,8 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 
 		['layout', 'messageReadDelay', 'messagesPerPage',
 		 'editorDefaultType', 'requestReadReceipt', 'requestDsn', 'pgpSign', 'pgpEncrypt',
-		 'viewHTML', 'showImages', 'removeColors', 'hideDeleted', 'listInlineAttachments',
-		 'useCheckboxesInList', 'useThreads', 'replySameFolder', 'msgDefaultAction'
+		 'viewHTML', 'showImages', 'removeColors', 'hideDeleted', 'listInlineAttachments', 'simpleAttachmentsList',
+		 'useCheckboxesInList', 'useThreads', 'replySameFolder', 'msgDefaultAction', 'allowSpellcheck'
 		].forEach(name => this[name] = SettingsUserStore[name]);
 
 		this.allowLanguagesOnSettings = !!SettingsGet('AllowLanguagesOnSettings');
@@ -97,9 +97,9 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 		this.addSetting('MessagesPerPage');
 		this.addSetting('Layout');
 
-		this.addSettings(['ViewHTML', 'ShowImages', 'HideDeleted', 'ListInlineAttachments',
+		this.addSettings(['ViewHTML', 'ShowImages', 'HideDeleted', 'ListInlineAttachments', 'simpleAttachmentsList',
 			'UseCheckboxesInList', 'ReplySameFolder',
-			'requestReadReceipt', 'requestDsn', 'pgpSign', 'pgpEncrypt',
+			'requestReadReceipt', 'requestDsn', 'pgpSign', 'pgpEncrypt', 'allowSpellcheck',
 			'DesktopNotifications', 'SoundNotification']);
 
 		const fReloadLanguageHelper = (saveSettingsStep) => () => {
diff --git a/dev/Stores/Theme.js b/dev/Stores/Theme.js
index 01c7a4afa..4a739791b 100644
--- a/dev/Stores/Theme.js
+++ b/dev/Stores/Theme.js
@@ -1,5 +1,5 @@
 import ko from 'ko';
-import { doc, $htmlCL, elementById, leftPanelDisabled, Settings, SettingsGet } from 'Common/Globals';
+import { $htmlCL, elementById, leftPanelDisabled, Settings, SettingsGet } from 'Common/Globals';
 import { isArray, arrayLength } from 'Common/Utils';
 import { serverRequestRaw } from 'Common/Links';
 import { SaveSettingStatus } from 'Common/Enums';
@@ -7,6 +7,8 @@ import { SaveSettingStatus } from 'Common/Enums';
 let __themeTimer = 0;
 
 export const
+	appEl = () => elementById('rl-app'),
+
 	ThemeStore = {
 		theme: ko.observable(''),
 		themes: ko.observableArray(),
@@ -65,7 +67,7 @@ ThemeStore.isMobile.subscribe(value => $htmlCL.toggle('rl-mobile', value));
 
 ThemeStore.fontSansSerif.subscribe(value => {
 	if (null != value) {
-		let cl = elementById('rl-app').classList;
+		let cl = appEl().classList;
 		cl.forEach(name => {
 			if (name.startsWith('font') && !/font(Serif|Mono)/.test(name)) {
 				cl.remove(name);
@@ -76,25 +78,20 @@ ThemeStore.fontSansSerif.subscribe(value => {
 });
 ThemeStore.fontSerif.subscribe(value => {
 	if (null != value) {
-		let cl = elementById('rl-app').classList;
+		let cl = appEl().classList;
 		cl.forEach(name => name.startsWith('fontSerif') && cl.remove(name));
 		value && cl.add('fontSerif'+value);
 	}
 });
 ThemeStore.fontMono.subscribe(value => {
 	if (null != value) {
-		let cl = elementById('rl-app').classList;
+		let cl = appEl().classList;
 		cl.forEach(name => name.startsWith('fontMono') && cl.remove(name));
 		value && cl.add('fontMono'+value);
 	}
 });
 
 ThemeStore.userBackgroundHash.subscribe(value => {
-	if (value) {
-		$htmlCL.add('UserBackground');
-		doc.body.style.backgroundImage = "url("+serverRequestRaw('UserBackground', value)+")";
-	} else {
-		$htmlCL.remove('UserBackground');
-		doc.body.removeAttribute('style');
-	}
+	appEl().classList.toggle('UserBackground', !!value);
+	appEl().style.backgroundImage = value ? "url("+serverRequestRaw('UserBackground', value)+")" : null;
 });
diff --git a/dev/Stores/User/Contact.js b/dev/Stores/User/Contact.js
index ec1f1b4e6..863759787 100644
--- a/dev/Stores/User/Contact.js
+++ b/dev/Stores/User/Contact.js
@@ -1,6 +1,5 @@
 import ko from 'ko';
 import { SettingsGet } from 'Common/Globals';
-import { pInt } from 'Common/Utils';
 import { koComputable, addObservablesTo, koArrayWithDestroy } from 'External/ko';
 import Remote from 'Remote/User/Fetch';
 
@@ -51,16 +50,14 @@ ContactUserStore.sync = fResultFunc => {
 };
 
 ContactUserStore.init = () => {
-	let value = !!SettingsGet('ContactsSyncIsAllowed');
-	ContactUserStore.allowSync(value);
-	if (value) {
-		ContactUserStore.syncMode(SettingsGet('ContactsSyncMode'));
-		ContactUserStore.syncUrl(SettingsGet('ContactsSyncUrl'));
-		ContactUserStore.syncUser(SettingsGet('ContactsSyncUser'));
-		ContactUserStore.syncPass(SettingsGet('ContactsSyncPassword'));
+	let config = SettingsGet('ContactsSync');
+	ContactUserStore.allowSync(!!config);
+	if (config) {
+		ContactUserStore.syncMode(config.Mode);
+		ContactUserStore.syncUrl(config.Url);
+		ContactUserStore.syncUser(config.User);
+		ContactUserStore.syncPass(config.Password);
 		setTimeout(ContactUserStore.sync, 10000);
-		value = pInt(SettingsGet('ContactsSyncInterval'));
-		value = 5 <= value ? (320 >= value ? value : 320) : 20;
-		setInterval(ContactUserStore.sync, value * 60000 + 5000);
+		setInterval(ContactUserStore.sync, config.Interval * 60000 + 5000);
 	}
 };
diff --git a/dev/Stores/User/GnuPG.js b/dev/Stores/User/GnuPG.js
index f42053b2f..8a3657baa 100644
--- a/dev/Stores/User/GnuPG.js
+++ b/dev/Stores/User/GnuPG.js
@@ -186,7 +186,7 @@ export const GnuPGUserStore = new class {
 				}
 				if (null !== params.Passphrase) {
 					const result = await Remote.post('GnupgDecrypt', null, params);
-					if (result?.Result) {
+					if (result?.Result && false !== result.Result.data) {
 						return result.Result;
 					}
 				}
diff --git a/dev/Stores/User/Messagelist.js b/dev/Stores/User/Messagelist.js
index 274917f03..afadf110a 100644
--- a/dev/Stores/User/Messagelist.js
+++ b/dev/Stores/User/Messagelist.js
@@ -347,7 +347,7 @@ MessagelistUserStore.removeMessagesFromList = (
 	fromFolderFullName, oUids, toFolderFullName = '', copy = false
 ) => {
 	let unseenCount = 0,
-		messageList = MessagelistUserStore,
+		setPage = 0,
 		currentMessage = MessageUserStore.message();
 
 	const trashFolder = FolderUserStore.trashFolder(),
@@ -356,7 +356,7 @@ MessagelistUserStore.removeMessagesFromList = (
 		toFolder = toFolderFullName ? getFolderFromCacheList(toFolderFullName) : null,
 		messages =
 			FolderUserStore.currentFolderFullName() === fromFolderFullName
-				? messageList.filter(item => item && oUids.has(item.uid))
+				? MessagelistUserStore.filter(item => item && oUids.has(item.uid))
 				: [];
 
 	messages.forEach(item => item?.isUnseen() && ++unseenCount);
@@ -406,47 +406,47 @@ MessagelistUserStore.removeMessagesFromList = (
 				item.deleted(true);
 			});
 
-			setTimeout(() => messages.forEach(item => messageList.remove(item)), 350);
+			setTimeout(() => messages.forEach(item => MessagelistUserStore.remove(item)), 350);
+
+			const
+				count = MessagelistUserStore.count() - messages.length,
+				page = MessagelistUserStore.page();
+			MessagelistUserStore.count(count);
+			if (page > MessagelistUserStore.pageCount()) {
+				setPage = MessagelistUserStore.pageCount();
+			}
 		}
 	}
 
-	if (MessagelistUserStore.threadUid()) {
-		if (
-			messageList.length &&
-			messageList.find(item => item?.deleted() && item.uid == MessagelistUserStore.threadUid())
-		) {
-			const message = messageList.find(item => item && !item.deleted());
-			let setHash;
-			if (!message) {
-				if (1 < MessagelistUserStore.page()) {
-					MessagelistUserStore.page(MessagelistUserStore.page() - 1);
-					setHash = 1;
-				} else {
-					MessagelistUserStore.threadUid(0);
-					replaceHash(
-						mailBox(
-							FolderUserStore.currentFolderFullNameHash(),
-							MessagelistUserStore.pageBeforeThread(),
-							MessagelistUserStore.listSearch()
-						)
-					);
-				}
-			} else if (MessagelistUserStore.threadUid() != message.uid) {
-				MessagelistUserStore.threadUid(message.uid);
-				setHash = 1;
-			}
-			if (setHash) {
-				replaceHash(
-					mailBox(
-						FolderUserStore.currentFolderFullNameHash(),
-						MessagelistUserStore.page(),
-						MessagelistUserStore.listSearch(),
-						MessagelistUserStore.threadUid()
-					)
-				);
+	if (MessagelistUserStore.threadUid()
+	 && MessagelistUserStore.length
+	 && MessagelistUserStore.find(item => item?.deleted() && item.uid == MessagelistUserStore.threadUid())
+	) {
+		const message = MessagelistUserStore.find(item => item && !item.deleted());
+		if (!message) {
+			if (1 < MessagelistUserStore.page()) {
+				setPage = MessagelistUserStore.page() - 1;
+			} else {
+				MessagelistUserStore.threadUid(0);
+				setPage = MessagelistUserStore.pageBeforeThread();
 			}
+		} else if (MessagelistUserStore.threadUid() != message.uid) {
+			MessagelistUserStore.threadUid(message.uid);
+			setPage = MessagelistUserStore.page();
 		}
 	}
+
+	if (setPage) {
+		MessagelistUserStore.page(setPage);
+		replaceHash(
+			mailBox(
+				FolderUserStore.currentFolderFullNameHash(),
+				setPage,
+				MessagelistUserStore.listSearch(),
+				MessagelistUserStore.threadUid()
+			)
+		);
+	}
 },
 
 MessagelistUserStore.reloadFlagsAndCachedMessage = () => {
diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js
index 701d1f8f5..c6398f9b1 100644
--- a/dev/Stores/User/Settings.js
+++ b/dev/Stores/User/Settings.js
@@ -19,6 +19,7 @@ export const SettingsUserStore = new class {
 			showImages: 0,
 			removeColors: 0,
 			listInlineAttachments: 0,
+			simpleAttachmentsList: 0,
 			useCheckboxesInList: 1,
 			allowDraftAutosave: 1,
 			useThreads: 0,
@@ -32,6 +33,7 @@ export const SettingsUserStore = new class {
 			requestDsn: 0,
 			pgpSign: 0,
 			pgpEncrypt: 0,
+			allowSpellcheck: 0,
 
 			layout: 1,
 			editorDefaultType: 'Html',
@@ -79,6 +81,7 @@ export const SettingsUserStore = new class {
 		self.showImages(SettingsGet('ShowImages'));
 		self.removeColors(SettingsGet('RemoveColors'));
 		self.listInlineAttachments(SettingsGet('ListInlineAttachments'));
+		self.simpleAttachmentsList(SettingsGet('simpleAttachmentsList'));
 		self.useCheckboxesInList(SettingsGet('UseCheckboxesInList'));
 		self.allowDraftAutosave(SettingsGet('AllowDraftAutosave'));
 		self.useThreads(SettingsGet('UseThreads'));
@@ -92,5 +95,6 @@ export const SettingsUserStore = new class {
 		self.requestDsn(SettingsGet('requestDsn'));
 		self.pgpSign(SettingsGet('pgpSign'));
 		self.pgpEncrypt(SettingsGet('pgpEncrypt'));
+		self.allowSpellcheck(SettingsGet('allowSpellcheck'));
 	}
 };
diff --git a/dev/Styles/@Boot.css b/dev/Styles/@Boot.css
index 95dbd117c..6febd89e8 100644
--- a/dev/Styles/@Boot.css
+++ b/dev/Styles/@Boot.css
@@ -38,12 +38,26 @@
 html, body {
 	margin: 0;
 	padding: 0;
+	-webkit-text-size-adjust: 100%; /* 2 */
+}
+
+#rl-app *, #rl-app *::before, #rl-app *::after {
+	box-sizing: border-box;
 }
 
 #rl-app {
 	background-color: var(--main-bg-color, #aaa);
 	color: var(--main-color, #333);
 	font-family: var(--fontSans);
+
+	-webkit-touch-callout: none;
+	font-size: var(--main-font-size, 14px);
+	line-height: 1.25; /* 1 */
+	position: fixed;
+	top: 0;
+	left: 0;
+	bottom: 0;
+	right: 0;
 }
 
 #rl-loading, #rl-loading-error {
diff --git a/dev/Styles/@Main.less b/dev/Styles/@Main.less
index a0af74919..994c9d501 100644
--- a/dev/Styles/@Main.less
+++ b/dev/Styles/@Main.less
@@ -57,11 +57,7 @@
 @import "_End.less";
 
 @media print {
-	body, html {
-		height: auto;
-		overflow: auto;
-	}
-	body, #rl-right {
+	#rl-app, #rl-right {
 		position: initial;
 	}
 	#rl-left {
diff --git a/dev/Styles/Admin/Domains.less b/dev/Styles/Admin/Domains.less
index 8c92ecb57..ae5aab987 100644
--- a/dev/Styles/Admin/Domains.less
+++ b/dev/Styles/Admin/Domains.less
@@ -7,12 +7,10 @@
 	.domain-name {
 		display: inline-block;
 		word-break: break-all;
-		box-sizing: border-box;
 	}
 
 	.domain-alias {
 		display: inline-block;
-		box-sizing: border-box;
 		color: #bbb;
 		padding-left: 5px;
 	}
diff --git a/dev/Styles/Admin/Layout.less b/dev/Styles/Admin/Layout.less
index 7ca56e2ee..383ade99a 100644
--- a/dev/Styles/Admin/Layout.less
+++ b/dev/Styles/Admin/Layout.less
@@ -45,17 +45,15 @@
 	height: 100%;
 
 	> .b-toolbar {
+		color: #fff;
+		display: flex;
 		position: absolute;
 		top: 0;
 		right: 0;
 		left: 0;
-		height: 34px;
 		padding: 8px @rlLowMargin 8px 0;
-		color: #fff;
 		text-shadow: 0 1px 1px #000;
 
-		display: flex;
-
 		h4 {
 			flex-grow: 1;
 			margin: 8px;
@@ -73,7 +71,6 @@
 	border: 1px solid var(--border-color, #aaa);
 	border-radius: var(--border-radius, 5px);
 	box-shadow: @rlMainShadow;
-	box-sizing: border-box;
 	height: calc(100% - 50px - @rlLowMargin - @rlLowMargin);
 	margin: (50px + @rlLowMargin) @rlLowMargin @rlLowMargin 0;
 	overflow-y: auto;
diff --git a/dev/Styles/Admin/Plugin.less b/dev/Styles/Admin/Plugin.less
index 370883f50..9459a1c5a 100644
--- a/dev/Styles/Admin/Plugin.less
+++ b/dev/Styles/Admin/Plugin.less
@@ -2,17 +2,6 @@
 
 	max-width: 660px;
 
-	.information {
-		display: inline-block;
-		background-color: #ddd;
-		border-radius: 10px;
-		cursor: pointer;
-		height: 25px;
-		width: 30px;
-		text-align: center;
-		padding-top: 5px;
-	}
-
 	textarea {
 		width: 400px;
 		height: 70px;
diff --git a/dev/Styles/Components.less b/dev/Styles/Components.less
index 5d61ccb65..501f72626 100644
--- a/dev/Styles/Components.less
+++ b/dev/Styles/Components.less
@@ -80,7 +80,6 @@
 
 	> div > div {
 		position: absolute;
-		box-sizing: border-box;
 		margin-top: 1px;
 
 		animation: checkmark-to-box 200ms ease-out forwards;
diff --git a/dev/Styles/Languages.less b/dev/Styles/Languages.less
index c13fcb37b..69a962767 100644
--- a/dev/Styles/Languages.less
+++ b/dev/Styles/Languages.less
@@ -6,7 +6,7 @@
 		display: inline-block;
 		padding: 5px 15px;
 		margin: 2px 5px;
-		width: 180px;
+		width: 216px;
 		background-color: rgba(128, 128, 128, 0.1);
 		border: 1px solid transparent;
 		border-radius: var(--input-border-radius, 3px);
@@ -34,8 +34,8 @@
 	}
 }
 
-@media screen and (max-width: 999px) {
+@media screen and (max-width: 733px) {
 	#V-PopupsLanguages label {
-		width: calc(100% - 40px);
+		width: 100%;
 	}
 }
diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less
index b713b3a13..120962a63 100644
--- a/dev/Styles/Login.less
+++ b/dev/Styles/Login.less
@@ -112,7 +112,7 @@
 	}
 
 	.buttonLogin {
-		margin: 0;
+		width: 100%;
 	}
 
 	.alert {
diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less
index f8e6c1bcb..6a9d4140a 100644
--- a/dev/Styles/Main.less
+++ b/dev/Styles/Main.less
@@ -3,23 +3,6 @@
  * 2. Prevent adjustments of font size after orientation changes in iOS.
  */
 
-html, body {
-	height: 100%;
-	overflow: hidden;
-	-webkit-text-size-adjust: 100%; /* 2 */
-}
-
-#rl-app {
-	-webkit-touch-callout: none;
-	font-size: var(--main-font-size, 14px);
-	line-height: 1.15; /* 1 */
-	position: fixed;
-	top: 0;
-	left: 0;
-	bottom: 0;
-	right: 0;
-}
-
 html.list-loading body {
 /*	cursor: wait;*/
 	cursor: progress;
diff --git a/dev/Styles/Ui.less b/dev/Styles/Ui.less
index f9d68d308..0c50878a2 100644
--- a/dev/Styles/Ui.less
+++ b/dev/Styles/Ui.less
@@ -20,7 +20,6 @@
 .settings-save-trigger {
 
 	display: inline-block;
-	height: 1em;
 	line-height: 1em;
 	margin-left: 0.5em !important;
 
diff --git a/dev/Styles/User/Attachments.less b/dev/Styles/User/Attachments.less
index 6f8108397..025b453d1 100644
--- a/dev/Styles/User/Attachments.less
+++ b/dev/Styles/User/Attachments.less
@@ -83,7 +83,6 @@
 	}
 
 	.iconMain, .iconPreview {
-		box-sizing: border-box;
 		padding: 6px 0 0;
 		font-size: 36px;
 		color: #aaa;
@@ -120,3 +119,22 @@
 		cursor: pointer;
 	}
 }
+
+.attachmentListSimple {
+	margin: 0;
+
+	.attachmentItem {
+		min-height: 1em;
+		border: 1px solid var(--border-color);
+		padding: 0 2px;
+	}
+
+	.attachmentName {
+		margin:0;
+	}
+
+	.checkboxAttachment {
+		position: initial;
+		margin-left:.5em;
+	}
+}
diff --git a/dev/Styles/User/Compose.less b/dev/Styles/User/Compose.less
index 434f1620d..a1c67e36a 100644
--- a/dev/Styles/User/Compose.less
+++ b/dev/Styles/User/Compose.less
@@ -19,7 +19,6 @@
 	}
 
 	.textAreaParent, .attachmentAreaParent {
-		box-sizing: border-box;
 		height: 100%;
 		min-height: 200px;
 		position: relative;
@@ -150,6 +149,8 @@
 @media screen and (max-width: 999px) {
 	#V-PopupsCompose {
 		border: 0;
+		height: calc(100vh - 100px);
+		margin: 0 auto;
 		width: 100%;
 	}
 }
diff --git a/dev/Styles/User/EmailAddresses.less b/dev/Styles/User/EmailAddresses.less
index 145ba47d2..543c8dc18 100644
--- a/dev/Styles/User/EmailAddresses.less
+++ b/dev/Styles/User/EmailAddresses.less
@@ -3,7 +3,6 @@
 	border: 1px solid var(--input-border-clr, #ccc);
 	border-radius: var(--input-border-radius, 3px);
 	box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-	box-sizing: border-box;
 	color: var(--input-clr, #555);
 	cursor: text;
 	font-size: 90%;
diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less
index c113cc50c..76c98a830 100644
--- a/dev/Styles/User/FolderList.less
+++ b/dev/Styles/User/FolderList.less
@@ -31,7 +31,6 @@
 
 	.b-toolbar {
 		top: 0;
-		height: 30px;
 		padding: 10px 0 0 @rlLowMargin;
 		color: #fff;
 		z-index: 101;
@@ -39,7 +38,6 @@
 
 	.b-footer {
 		bottom: 10px;
-		height: 30px;
 		padding: 0 10px 0 5px;
 		z-index: 101;
 
@@ -69,7 +67,6 @@
 			display: block;
 			position: relative;
 			z-index: 1;
-			height: 34px;
 			line-height: 34px;
 			background-color: transparent;
 			vertical-align: middle;
@@ -222,8 +219,7 @@
 		max-width: -webkit-fit-content;
 		max-width: fit-content;
 		overflow: hidden;
-		height: 19px;
-		padding: 4px 8px;
+		max-height: 2em;
 	}
 }
 
diff --git a/dev/Styles/User/Layout.less b/dev/Styles/User/Layout.less
index 8c0625a42..04d98fbee 100644
--- a/dev/Styles/User/Layout.less
+++ b/dev/Styles/User/Layout.less
@@ -1,5 +1,5 @@
 
-.UserBackground body {
+#rl-app.UserBackground {
 	background-size: cover;
 	background-repeat: no-repeat;
 	background-position: center;
@@ -105,7 +105,7 @@ html:not(.rl-left-panel-disabled) #rl-left > .resizer,
 
 #V-MailMessageView {
 	position: absolute;
-	top: 50px + @rlLowMargin;
+	top: 50px;
 	bottom: 13px;
 	right: 0;
 	left: 0;
diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index 0dbd35510..ef8fbfee7 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -17,7 +17,6 @@ html.rl-no-preview-pane {
 }
 
 #V-MailMessageList .btn-toolbar {
-	height: 30px;
 	padding: 10px 1px;
 	white-space: nowrap;
 }
diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less
index 073633866..3c81a2a30 100644
--- a/dev/Styles/User/MessageView.less
+++ b/dev/Styles/User/MessageView.less
@@ -17,7 +17,7 @@ html.rl-no-preview-pane {
 
 	.toolbar {
 		position: absolute;
-		top: -50px - @rlLowMargin;
+		top: -50px;
 		right: 0;
 		left: 0;
 		height: 30px;
@@ -44,9 +44,8 @@ html.rl-no-preview-pane {
 	.b-message-view-checked-helper {
 		text-align: center;
 		font-size: 70px;
-		line-height: 70px;
-		padding-top: 100px;
-		color: #999;
+		padding-top: 25vh;
+		opacity: 0.6;
 	}
 	.b-message-view-checked-helper::after {
 		content: ' ✉';
@@ -58,7 +57,7 @@ html.rl-no-preview-pane {
 		font-size: 24px;
 		line-height: 30px;
 		color: #999;
-		padding: 120px 10px 0 10px;
+		padding: 25vh 10px 0;
 	}
 
 	.b-message-view-desc.error {
@@ -95,7 +94,6 @@ html.rl-no-preview-pane {
 	}
 
 	.messageTags {
-		margin-top: 6px;
 		align-items: baseline;
 		display: flex;
 	}
@@ -128,7 +126,6 @@ html.rl-no-preview-pane {
 			display: flex;
 			font-size: 18px;
 			font-weight: bold;
-			margin-bottom: 8px;
 		}
 
 		.subject {
@@ -148,7 +145,7 @@ html.rl-no-preview-pane {
 		}
 
 		.informationShort {
-			margin: 4px 40px 0 0;
+			margin: 0 40px 0 0;
 			overflow: hidden;
 			text-overflow: ellipsis;
 
@@ -253,33 +250,6 @@ html.rl-no-preview-pane {
 	overflow: auto;
 	scroll-behavior: smooth;
 
-	.buttonFull {
-		display: inline-block;
-		position: fixed;
-		right: 8px;
-		bottom: 8px;
-		height: 30px;
-		width: 30px;
-		text-align: center;
-		vertical-align: middle;
-		line-height: 30px;
-		background-color: transparent;
-		background-color: #fff;
-		border: 1px solid #333;
-		color: #333;
-		z-index: 2;
-		cursor: pointer;
-		border-radius: var(--border-radius, 5px);
-		opacity: 0.5;
-
-		&:hover {
-			opacity: 0.8;
-			border-color: #666;
-			background-color: #888;
-			color: #fff;
-		}
-	}
-
 	.loading {
 		text-align: center;
 		font-size: 24px;
@@ -345,6 +315,7 @@ html.rl-no-preview-pane {
 		border-bottom: 1px solid var(--border-color, #bbb);
 	}
 	.attachmentsControls > * {
+		display: inline-block;
 		margin-right: 0.5em;
 		white-space: nowrap;
 	}
@@ -539,9 +510,3 @@ html.rl-fullscreen {
 		border: 0;
 	}
 }
-
-html:not(.rl-mobile) #messageItem {
-	.buttonFull {
-		display: none !important;
-	}
-}
diff --git a/dev/Styles/User/Settings.less b/dev/Styles/User/Settings.less
index 517ca7012..23c275c83 100644
--- a/dev/Styles/User/Settings.less
+++ b/dev/Styles/User/Settings.less
@@ -27,11 +27,13 @@
 			cursor: pointer;
 			display: block;
 			font-size: 18px;
-			height: 30px;
-			line-height: 29px;
+			line-height: 2em;
+			max-height: 2em;
 			overflow: hidden;
-			padding: 4px 10px;
+			padding: 0 10px;
 			text-decoration: none;
+			text-overflow: ellipsis;
+			white-space: nowrap;
 		}
 
 		a:focus, a:hover {
@@ -54,7 +56,6 @@
 		top: 0;
 		right: 0;
 		left: 0;
-		height: 34px;
 		padding: 8px 0;
 		color: #fff;
 	}
@@ -71,7 +72,6 @@
 	scroll-behavior: smooth;
 	padding:20px;
 
-	box-sizing: border-box;
 	height: calc(100% - 50px - @rlLowMargin - @rlLowMargin);
 
 	background-color: var(--settings-bg-clr, #fff);
diff --git a/dev/Styles/User/SquireUI.less b/dev/Styles/User/SquireUI.less
index 69450373f..e7fe24dc5 100644
--- a/dev/Styles/User/SquireUI.less
+++ b/dev/Styles/User/SquireUI.less
@@ -37,7 +37,6 @@
 */
 
 .squire-wysiwyg, .squire-plain {
-	box-sizing: border-box;
 	font-size: 13px;
 	height: 100%;
 	line-height: 16px;
@@ -163,7 +162,3 @@ Secondly, we can't rely on MUA's what to do with :empty
 	*/
 	}
 }
-
-.rl-mobile #V-PopupsCompose {
-	min-height: calc(100% - 12px);
-}
diff --git a/dev/Styles/User/SystemDropDown.less b/dev/Styles/User/SystemDropDown.less
index 2411de68b..406df8f48 100644
--- a/dev/Styles/User/SystemDropDown.less
+++ b/dev/Styles/User/SystemDropDown.less
@@ -15,7 +15,6 @@
 	position: absolute;
 	top: 0;
 	right: 0;
-	height: 30px;
 	padding: 10px @rlLowMargin;
 	z-index: 103;
 
@@ -33,7 +32,7 @@
 		cursor: pointer;
 		display: inline-block;
 		font-size: 30px;
-		height: 30px;
+		height: 1em;
 		margin-right: 10px;
 		width: 1em;
 
@@ -61,8 +60,7 @@
 		display: inline-block;
 		font-weight: bold;
 		font-size: 16px;
-		height: 29px;
-		line-height: 30px;
+		line-height: 29px;
 		max-width: 25vw;
 		overflow: hidden;
 		padding: 1px 8px;
diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less
index a7f883ed6..19bfc1adb 100644
--- a/dev/Styles/_FontasticToBoot.less
+++ b/dev/Styles/_FontasticToBoot.less
@@ -8,7 +8,7 @@
 [class^="icon-"],
 [class*=" icon-"] {
 	display: inline-block;
-	width: 1em;
+	min-width: 1em;
 
 	.disabled &,
 	.btn[disabled] & {
@@ -35,8 +35,8 @@
 
 .icon-spinner {
 
-	height: 0.75em;
-	width: 0.75em;
+	height: 1.2em;
+	width: 1.2em;
 
 	margin: 0 -1px;
 
diff --git a/dev/View/Admin/Settings/Pane.js b/dev/View/Admin/Settings/Pane.js
index 207c90440..c19c1d7d7 100644
--- a/dev/View/Admin/Settings/Pane.js
+++ b/dev/View/Admin/Settings/Pane.js
@@ -2,12 +2,13 @@ import Remote from 'Remote/Admin/Fetch';
 
 import { AbstractViewRight } from 'Knoin/AbstractViews';
 
-import { leftPanelDisabled } from 'Common/Globals';
+import { leftPanelDisabled, toggleLeftPanel } from 'Common/Globals';
 
 export class PaneSettingsAdminView extends AbstractViewRight {
 	constructor() {
 		super('AdminPane');
 		this.leftPanelDisabled = leftPanelDisabled;
+		this.toggleLeftPanel = toggleLeftPanel;
 	}
 
 	logoutClick() {
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index ae599a55e..d17098331 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -11,7 +11,7 @@ import {
 	SetSystemFoldersNotification
 } from 'Common/EnumsUser';
 
-import { pInt, isArray, arrayLength, forEachObjectEntry } from 'Common/Utils';
+import { pInt, isArray, arrayLength } from 'Common/Utils';
 import { encodeHtml, HtmlEditor, htmlToPlain } from 'Common/Html';
 import { koArrayWithDestroy, addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko';
 
@@ -214,6 +214,7 @@ export class ComposePopupView extends AbstractViewPopup {
 
 		this.allowContacts = AppUserStore.allowContacts();
 		this.allowIdentities = SettingsCapa('Identities');
+		this.allowSpellcheck = SettingsUserStore.allowSpellcheck;
 
 		addObservablesTo(this, {
 			identitiesDropdownTrigger: false,
@@ -271,15 +272,11 @@ export class ComposePopupView extends AbstractViewPopup {
 			currentIdentity: IdentityUserStore()[0]
 		});
 
-		// this.to.subscribe((v) => console.log(v));
-
 		// Used by ko.bindingHandlers.emailsTags
-		this.to.focused = ko.observable(false);
-		this.to.focused.subscribe(value => value && (this.sLastFocusedField = 'to'));
-		this.cc.focused = ko.observable(false);
-		this.cc.focused.subscribe(value => value && (this.sLastFocusedField = 'cc'));
-		this.bcc.focused = ko.observable(false);
-		this.bcc.focused.subscribe(value => value && (this.sLastFocusedField = 'bcc'));
+		['to','cc','bcc'].forEach(name => {
+			this[name].focused = ko.observable(false);
+			this[name].focused.subscribe(value => value && (this.sLastFocusedField = name));
+		});
 
 		this.attachments = koArrayWithDestroy();
 
@@ -976,28 +973,22 @@ export class ComposePopupView extends AbstractViewPopup {
 		if (arrayLength(downloads)) {
 			Remote.request('MessageUploadAttachments',
 				(iError, oData) => {
-					if (!iError) {
-						forEachObjectEntry(oData.Result, (tempName, id) => {
-							const attachment = this.getAttachmentById(id);
-							if (attachment) {
-								attachment.tempName(tempName);
-								attachment
-									.waiting(false)
-									.uploading(false)
-									.complete(true);
+					const result = oData?.Result;
+					downloads.forEach((id, index) => {
+						const attachment = this.getAttachmentById(id);
+						if (attachment) {
+							attachment
+								.waiting(false)
+								.uploading(false)
+								.complete(true);
+							if (iError || !result?.[index]) {
+								attachment.error(getUploadErrorDescByCode(UploadErrorCode.NoFileUploaded));
+							} else {
+								attachment.tempName(result[index].TempName);
+								attachment.type(result[index].MimeType);
 							}
-						});
-					} else {
-						this.attachments.forEach(attachment => {
-							if (attachment?.fromMessage) {
-								attachment
-									.waiting(false)
-									.uploading(false)
-									.complete(true)
-									.error(getUploadErrorDescByCode(UploadErrorCode.NoFileUploaded));
-							}
-						});
-					}
+						}
+					});
 				},
 				{
 					Attachments: downloads
@@ -1013,9 +1004,8 @@ export class ComposePopupView extends AbstractViewPopup {
 		setTimeout(() => {
 			if (!this.to()) {
 				this.to.focused(true);
-			// TODO https://github.com/the-djmaze/snappymail/issues/501#issuecomment-1255906243
-//			} else if (!this.subject()) {
-//				this.subject.focus();
+			} else if (!this.subject()) {
+				this.viewModelDom.querySelector('input[name="subject"]').focus();
 			} else {
 				this.oEditor?.focus();
 			}
@@ -1127,6 +1117,7 @@ export class ComposePopupView extends AbstractViewPopup {
 						attachment.size(attachmentJson.Size ? pInt(attachmentJson.Size) : 0);
 						attachment.tempName(attachmentJson.TempName ? attachmentJson.TempName : '');
 						attachment.isInline = false;
+						attachment.type(attachmentJson.MimeType);
 					}
 				}
 			});
@@ -1182,20 +1173,6 @@ export class ComposePopupView extends AbstractViewPopup {
 		return this.attachments.find(item => item && id === item.id);
 	}
 
-	/**
-	 * @returns {Object}
-	 */
-	prepareAttachmentsForSendOrSave() {
-		const result = {};
-		this.attachments.forEach(item => {
-			if (item?.complete() && item?.tempName() && item?.enabled()) {
-				result[item.tempName()] = [item.fileName(), item.isInline ? '1' : '0', item.CID, item.contentLocation];
-			}
-		});
-
-		return result;
-	}
-
 	/**
 	 * @param {MessageModel} message
 	 */
@@ -1241,6 +1218,7 @@ export class ComposePopupView extends AbstractViewPopup {
 		if (message) {
 			let reply = [ComposeType.Reply, ComposeType.ReplyAll].includes(type);
 			if (reply || [ComposeType.Forward, ComposeType.Draft, ComposeType.EditAsNew].includes(type)) {
+				// item instanceof AttachmentModel
 				message.attachments.forEach(item => {
 					if (!reply || item.isLinked()) {
 						const attachment = new ComposeAttachmentModel(
@@ -1253,6 +1231,7 @@ export class ComposePopupView extends AbstractViewPopup {
 							item.contentLocation
 						);
 						attachment.fromMessage = true;
+						attachment.type(item.mimeType);
 						this.addAttachment(attachment);
 					}
 				});
@@ -1409,6 +1388,20 @@ export class ComposePopupView extends AbstractViewPopup {
 
 	async getMessageRequestParams(sSaveFolder, draft)
 	{
+		// Prepare ComposeAttachmentModel attachments
+		const attachments = {};
+		this.attachments.forEach(item => {
+			if (item?.complete() && item?.tempName() && item?.enabled()) {
+				attachments[item.tempName()] = {
+					name: item.fileName(),
+					inline: item.isInline,
+					cid: item.CID,
+					location: item.contentLocation,
+					type: item.mimeType()
+				};
+			}
+		});
+
 		const
 			identity = this.currentIdentity(),
 			params = {
@@ -1426,7 +1419,7 @@ export class ComposePopupView extends AbstractViewPopup {
 				InReplyTo: this.sInReplyTo,
 				References: this.sReferences,
 				MarkAsImportant: this.markAsImportant() ? 1 : 0,
-				Attachments: this.prepareAttachmentsForSendOrSave(),
+				Attachments: attachments,
 				// Only used at send, not at save:
 				Dsn: this.requestDsn() ? 1 : 0,
 				ReadReceiptRequest: this.requestReadReceipt() ? 1 : 0
diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js
index a2022a725..11432b1ce 100644
--- a/dev/View/Popup/Domain.js
+++ b/dev/View/Popup/Domain.js
@@ -12,24 +12,49 @@ import { DomainAdminStore } from 'Stores/Admin/Domain';
 
 import { AskPopupView } from 'View/Popup/Ask';
 
-const domainToParams = oDomain => ({
-			Name: oDomain.name(),
-
-			IncHost: oDomain.imapHost(),
-			IncPort: oDomain.imapPort(),
-			IncSecure: oDomain.imapSecure(),
-
-			UseSieve: oDomain.useSieve() ? 1 : 0,
-			SieveHost: oDomain.sieveHost(),
-			SievePort: oDomain.sievePort(),
-			SieveSecure: oDomain.sieveSecure(),
-
-			OutHost: oDomain.smtpHost(),
-			OutPort: oDomain.smtpPort(),
-			OutSecure: oDomain.smtpSecure(),
-			OutAuth: oDomain.smtpAuth() ? 1 : 0,
-			OutUsePhpMail: oDomain.smtpPhpMail() ? 1 : 0
-		});
+const
+	capitalize = string => string.charAt(0).toUpperCase() + string.slice(1),
+	domainToParams = oDomain => ({
+		Name: oDomain.name(),
+		IMAP: {
+			host: oDomain.imapHost(),
+			port: oDomain.imapPort(),
+			secure: pInt(oDomain.imapType()),
+			shortLogin: !!oDomain.imapShortLogin(),
+			ssl: {
+				verify_peer: !!oDomain.imapSslVerify_peer(),
+				verify_peer_name: !!oDomain.imapSslVerify_peer(),
+				allow_self_signed: !!oDomain.imapSslAllow_self_signed()
+			}
+		},
+		SMTP: {
+			host: oDomain.smtpHost(),
+			port: oDomain.smtpPort(),
+			secure: pInt(oDomain.smtpType()),
+			shortLogin: !!oDomain.smtpShortLogin(),
+			ssl: {
+				verify_peer: !!oDomain.smtpSslVerify_peer(),
+				verify_peer_name: !!oDomain.smtpSslVerify_peer(),
+				allow_self_signed: !!oDomain.smtpSslAllow_self_signed()
+			},
+			setSender: !!oDomain.smtpSetSender(),
+			useAuth: !!oDomain.smtpUseAuth(),
+			usePhpMail: !!oDomain.smtpUsePhpMail()
+		},
+		Sieve: {
+			enabled: !!oDomain.sieveEnabled(),
+			host: oDomain.sieveHost(),
+			port: oDomain.sievePort(),
+			secure: pInt(oDomain.sieveType()),
+			shortLogin: !!oDomain.imapShortLogin(),
+			ssl: {
+				verify_peer: !!oDomain.imapSslVerify_peer(),
+				verify_peer_name: !!oDomain.imapSslVerify_peer(),
+				allow_self_signed: !!oDomain.imapSslAllow_self_signed()
+			}
+		},
+		whiteList: oDomain.whiteList()
+	});
 
 export class DomainPopupView extends AbstractViewPopup {
 	constructor() {
@@ -82,14 +107,14 @@ export class DomainPopupView extends AbstractViewPopup {
 			},
 
 			domainIsComputed: () => {
-				const usePhpMail = this.smtpPhpMail(),
-					useSieve = this.useSieve();
+				const usePhpMail = this.smtpUsePhpMail(),
+					sieveEnabled = this.sieveEnabled();
 
 				return (
 					this.name() &&
 					this.imapHost() &&
 					this.imapPort() &&
-					(useSieve ? this.sieveHost() && this.sievePort() : true) &&
+					(sieveEnabled ? this.sieveHost() && this.sievePort() : true) &&
 					((this.smtpHost() && this.smtpPort()) || usePhpMail)
 				);
 			},
@@ -113,7 +138,7 @@ export class DomainPopupView extends AbstractViewPopup {
 			smtpHostFocus: value => value && this.imapHost() && !this.smtpHost()
 				&& this.smtpHost(this.imapHost().replace(/imap/gi, 'smtp')),
 
-			imapSecure: value => {
+			imapType: value => {
 				if (this.enableSmartPorts()) {
 					const port = pInt(this.imapPort());
 					switch (pInt(value)) {
@@ -133,7 +158,7 @@ export class DomainPopupView extends AbstractViewPopup {
 				}
 			},
 
-			smtpSecure: value => {
+			smtpType: value => {
 				if (this.enableSmartPorts()) {
 					const port = pInt(this.smtpPort());
 					switch (pInt(value)) {
@@ -169,14 +194,7 @@ export class DomainPopupView extends AbstractViewPopup {
 		Remote.request('AdminDomainSave',
 			this.onDomainCreateOrSaveResponse.bind(this),
 			Object.assign(domainToParams(this), {
-				Create: this.edit() ? 0 : 1,
-
-				IncShortLogin: this.imapShortLogin() ? 1 : 0,
-
-				OutShortLogin: this.smtpShortLogin() ? 1 : 0,
-				OutSetSender: this.smtpSetSender() ? 1 : 0,
-
-				WhiteList: this.whiteList()
+				Create: this.edit() ? 0 : 1
 			})
 		);
 	}
@@ -188,8 +206,10 @@ export class DomainPopupView extends AbstractViewPopup {
 			if (credentials) {
 				this.testing(true);
 				const params = domainToParams(this);
-				params.username = credentials.username;
-				params.password = credentials.password;
+				params.auth = {
+					user: credentials.username,
+					pass: credentials.password
+				};
 				Remote.request('AdminDomainTest',
 					(iError, oData) => {
 						this.testing(false);
@@ -250,7 +270,23 @@ export class DomainPopupView extends AbstractViewPopup {
 		if (oDomain) {
 			this.enableSmartPorts(false);
 			this.edit(true);
-			forEachObjectEntry(oDomain, (key, value) => this[key]?.(value));
+			forEachObjectEntry(oDomain, (key, value) => {
+				if ('IMAP' === key || 'SMTP' === key || 'Sieve' === key) {
+					key = key.toLowerCase();
+					forEachObjectEntry(value, (skey, value) => {
+						skey = capitalize(skey);
+						if ('Ssl' == skey) {
+							forEachObjectEntry(value, (sslkey, value) => {
+								this[key + skey + capitalize(sslkey)]?.(value);
+							});
+						} else {
+							this[key + skey]?.(value);
+						}
+					});
+				} else {
+					this[key]?.(value);
+				}
+			});
 			this.enableSmartPorts(true);
 		}
 	}
@@ -265,21 +301,27 @@ export class DomainPopupView extends AbstractViewPopup {
 
 			imapHost: '',
 			imapPort: 143,
-			imapSecure: 0,
+			imapType: 0,
 			imapShortLogin: false,
+			// SSL
+			imapSslVerify_peer: false,
+			imapSslAllow_self_signed: false,
 
-			useSieve: false,
+			sieveEnabled: false,
 			sieveHost: '',
 			sievePort: 4190,
-			sieveSecure: 0,
+			sieveType: 0,
 
 			smtpHost: '',
 			smtpPort: 25,
-			smtpSecure: 0,
+			smtpType: 0,
 			smtpShortLogin: false,
-			smtpAuth: true,
+			smtpUseAuth: true,
 			smtpSetSender: false,
-			smtpPhpMail: false,
+			smtpUsePhpMail: false,
+			// SSL
+			smtpSslVerify_peer: false,
+			smtpSslAllow_self_signed: false,
 
 			whiteList: '',
 			aliasName: ''
diff --git a/dev/View/Popup/OpenPgpImport.js b/dev/View/Popup/OpenPgpImport.js
index f8c43951b..30b80f0e2 100644
--- a/dev/View/Popup/OpenPgpImport.js
+++ b/dev/View/Popup/OpenPgpImport.js
@@ -69,8 +69,8 @@ export class OpenPgpImportPopupView extends AbstractViewPopup {
 		this.close();
 	}
 
-	onShow() {
-		this.key('');
+	onShow(key) {
+		this.key(key || '');
 		this.keyError(false);
 		this.keyErrorMessage('');
 	}
diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js
index ac10ada46..1c6b18572 100644
--- a/dev/View/User/MailBox/FolderList.js
+++ b/dev/View/User/MailBox/FolderList.js
@@ -1,7 +1,7 @@
 import ko from 'ko';
 
 import { Scope } from 'Common/Enums';
-import { moveAction, addShortcut } from 'Common/Globals';
+import { addShortcut } from 'Common/Globals';
 import { mailBox, settings } from 'Common/Links';
 //import { setFolderHash } from 'Common/Cache';
 import { addComputablesTo } from 'External/ko';
@@ -15,7 +15,7 @@ import { MessagelistUserStore } from 'Stores/User/Messagelist';
 import { showScreenPopup } from 'Knoin/Knoin';
 import { AbstractViewLeft } from 'Knoin/AbstractViews';
 
-import { showMessageComposer } from 'Common/UtilsUser';
+import { showMessageComposer, moveAction } from 'Common/UtilsUser';
 import { FolderCreatePopupView } from 'View/Popup/FolderCreate';
 import { ContactsPopupView } from 'View/Popup/Contacts';
 import { ComposePopupView } from 'View/Popup/Compose';
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index c8009c018..69fcbecce 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -5,17 +5,17 @@ import { Scope } from 'Common/Enums';
 
 import { ComposeType, FolderType, MessageSetAction } from 'Common/EnumsUser';
 
-import { leftPanelDisabled, moveAction,
+import { leftPanelDisabled, toggleLeftPanel,
 	Settings, SettingsCapa,
 	addEventsListeners,
 	addShortcut, registerShortcut, formFieldFocused
 } from 'Common/Globals';
 
-import { computedPaginatorHelper, showMessageComposer, populateMessageBody } from 'Common/UtilsUser';
+import { computedPaginatorHelper, showMessageComposer, populateMessageBody, download, moveAction } from 'Common/UtilsUser';
 import { FileInfo } from 'Common/File';
 import { isFullscreen, toggleFullscreen } from 'Common/Fullscreen';
 
-import { mailBox } from 'Common/Links';
+import { mailBox, attachmentDownload } from 'Common/Links';
 import { Selector } from 'Common/Selector';
 
 import { i18n } from 'Common/Translator';
@@ -83,6 +83,7 @@ export class MailMessageList extends AbstractViewRight {
 
 		this.isMobile = ThemeStore.isMobile;
 		this.leftPanelDisabled = leftPanelDisabled;
+		this.toggleLeftPanel = toggleLeftPanel;
 
 		this.popupVisibility = arePopupsVisible;
 
@@ -258,6 +259,7 @@ export class MailMessageList extends AbstractViewRight {
 		).throttle(50));
 
 		decorateKoCommands(this, {
+			downloadCommand: canBeMovedHelper,
 			forwardCommand: canBeMovedHelper,
 			deleteWithoutMoveCommand: canBeMovedHelper,
 			deleteCommand: canBeMovedHelper,
@@ -290,6 +292,34 @@ export class MailMessageList extends AbstractViewRight {
 		]);
 	}
 
+	downloadCommand() {
+		let hashes = [];
+		MessagelistUserStore.forEach(message => {
+			if (message.checked()) {
+				message.attachments.forEach(attachment => {
+					if (!attachment.isLinked() && attachment.download) {
+						hashes.push(attachment.download);
+					}
+				});
+			}
+		});
+		if (hashes.length) {
+			Remote.post('AttachmentsActions', null, {
+				Do: 'Zip',
+				Hashes: hashes
+			})
+			.then(result => {
+				let hash = result?.Result?.FileHash;
+				if (hash) {
+					download(attachmentDownload(hash), hash+'.zip');
+				} else {
+					alert('Download failed');
+				}
+			})
+			.catch(() => alert('Download failed'));
+		}
+	}
+
 	deleteWithoutMoveCommand() {
 		SettingsCapa('DangerousActions')
 		&& moveMessagesToFolderType(FolderType.Trash, true);
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index 8d1bd6bd3..a589de2bc 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -15,7 +15,6 @@ import {
 	elementById,
 	leftPanelDisabled,
 	keyScopeReal,
-	moveAction,
 	Settings,
 	SettingsCapa,
 	fireEvent,
@@ -24,7 +23,7 @@ import {
 } from 'Common/Globals';
 
 import { arrayLength } from 'Common/Utils';
-import { download, mailToHelper, showMessageComposer } from 'Common/UtilsUser';
+import { download, mailToHelper, showMessageComposer, moveAction } from 'Common/UtilsUser';
 import { isFullscreen, exitFullscreen, toggleFullscreen } from 'Common/Fullscreen';
 
 import { SMAudio } from 'Common/Audio';
@@ -55,10 +54,17 @@ import { MimeToMessage } from 'Mime/Utils';
 
 import { MessageModel } from 'Model/Message';
 
+import { showScreenPopup } from 'Knoin/Knoin';
+import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport';
+import { GnuPGUserStore } from 'Stores/User/GnuPG';
+import { OpenPGPUserStore } from 'Stores/User/OpenPGP';
+
 const
 	oMessageScrollerDom = () => elementById('messageItem') || {},
 
-	currentMessage = MessageUserStore.message;
+	currentMessage = MessageUserStore.message,
+
+	fetchRaw = url => rl.fetch(url).then(response => response.ok && response.text());
 
 export class MailMessageView extends AbstractViewRight {
 	constructor() {
@@ -92,6 +98,7 @@ export class MailMessageView extends AbstractViewRight {
 				}, this.messageVisibility);
 
 		this.msgDefaultAction = SettingsUserStore.msgDefaultAction;
+		this.simpleAttachmentsList = SettingsUserStore.simpleAttachmentsList;
 
 		addObservablesTo(this, {
 			showAttachmentControls: !!Local.get(ClientSideKeyNameMessageAttachmentControls),
@@ -154,9 +161,9 @@ export class MailMessageView extends AbstractViewRight {
 					case 'none':
 						return '';
 					case 'pass':
-						return 'icon-ok iconcolor-green';
+						return 'icon-ok iconcolor-green'; // ✔️
 					default:
-						return 'icon-warning-alt iconcolor-red';
+						return 'icon-cross iconcolor-red'; // ✖ ❌
 				}
 			},
 
@@ -182,7 +189,8 @@ export class MailMessageView extends AbstractViewRight {
 						this.scrollMessageToTop();
 					}
 					this.viewHash = message.hash;
-					this.viewFromShort(message.fromToLine(true, true));
+					// TODO: make first param a user setting #683
+					this.viewFromShort(message.fromToLine(false, true));
 					this.viewFromDkimData(message.fromDkimData());
 					this.viewToShort(message.toToLine(true, true));
 				} else {
@@ -257,8 +265,9 @@ export class MailMessageView extends AbstractViewRight {
 				return;
 			}
 
-			if (eqs(event, '.attachmentsPlace .attachmentIconParent')) {
+			if (eqs(event, '.attachmentsPlace .showPreview')) {
 				event.stopPropagation();
+				return;
 			}
 
 			el = eqs(event, '.attachmentsPlace .showPreplay');
@@ -279,26 +288,28 @@ export class MailMessageView extends AbstractViewRight {
 						// no default
 					}
 				}
+				return;
 			}
 
-			el = eqs(event, '.attachmentsPlace .attachmentItem .attachmentNameParent');
+			el = eqs(event, '.attachmentItem');
 			if (el) {
-				const attachment = ko.dataFor(el);
-				if (attachment?.linkDownload()) {
-					if ('message/rfc822' == attachment.mimeType) {
+				const attachment = ko.dataFor(el), url = attachment?.linkDownload();
+				if (url) {
+					if ('application/pgp-keys' == attachment.mimeType
+					 && (OpenPGPUserStore.isSupported() || GnuPGUserStore.isSupported())) {
+						fetchRaw(url).then(text =>
+							showScreenPopup(OpenPgpImportPopupView, [text])
+						);
+					} else if ('message/rfc822' == attachment.mimeType) {
 						// TODO
-						rl.fetch(attachment.linkDownload()).then(response => {
-							if (response.ok) {
-								response.text().then(text => {
-									const oMessage = new MessageModel();
-									MimeToMessage(text, oMessage);
-									// cleanHTML
-									oMessage.viewPopupMessage();
-								});
-							}
+						fetchRaw(url).then(text => {
+							const oMessage = new MessageModel();
+							MimeToMessage(text, oMessage);
+							// cleanHTML
+							oMessage.viewPopupMessage();
 						});
 					} else {
-						download(attachment.linkDownload(), attachment.fileName);
+						download(url, attachment.fileName);
 					}
 				}
 			}
diff --git a/dev/View/User/Settings/Pane.js b/dev/View/User/Settings/Pane.js
index d9d9916f4..0c7c43f2c 100644
--- a/dev/View/User/Settings/Pane.js
+++ b/dev/View/User/Settings/Pane.js
@@ -1,6 +1,6 @@
 import { mailbox } from 'Common/Links';
 import { getFolderInboxName } from 'Common/Cache';
-import { leftPanelDisabled } from 'Common/Globals';
+import { leftPanelDisabled, toggleLeftPanel } from 'Common/Globals';
 
 import { MessageUserStore } from 'Stores/User/Message';
 import { ThemeStore } from 'Stores/Theme';
@@ -13,6 +13,7 @@ export class SettingsPaneUserView extends AbstractViewRight {
 
 		this.isMobile = ThemeStore.isMobile;
 		this.leftPanelDisabled = leftPanelDisabled;
+		this.toggleLeftPanel = toggleLeftPanel;
 	}
 
 	onShow() {
diff --git a/dev/boot.js b/dev/boot.js
index af5fb5c8d..f4d131326 100644
--- a/dev/boot.js
+++ b/dev/boot.js
@@ -1,13 +1,11 @@
 (doc => {
 
-navigator.cookieEnabled || doc.location.replace('./?/NoCookie');
-
 const
 	eId = id => doc.getElementById('rl-'+id),
 	app = eId('app'),
 	admin = app && '1' == app.dataset.admin,
 	layout = doc.cookie.match(/(^|;) ?rllayout=([^;]+)/) || '',
-	badBrowser = () => doc.location.replace('./?/BadBrowser'),
+	redirect = path => doc.location.replace('./?/'+path),
 
 	showError = msg => {
 		let div = eId('loading-error');
@@ -23,14 +21,15 @@ const
 		return new Promise((resolve, reject) => {
 			const script = doc.createElement('script');
 			script.onload = () => resolve();
-			script.onerror = () => reject(new Error('Failed loading ' + src));
+			script.onerror = () => reject('Failed loading ' + src);
 			script.src = src;
 //			script.async = true;
 			doc.head.append(script);
 		});
 	};
 
-[].flat || badBrowser();
+navigator.cookieEnabled || redirect('NoCookie');
+[].flat || redirect('BadBrowser');
 
 let RL_APP_DATA = {};
 
@@ -45,13 +44,13 @@ window.rl = {
 		app: name => RL_APP_DATA.System[name]
 	},
 
-	setWindowTitle: title =>
-		doc.title = RL_APP_DATA.Title ? (title ? title + ' - ' : '') + RL_APP_DATA.Title : (title ? '' + title : ''),
+	setTitle: title =>
+		doc.title = (title || '') + (RL_APP_DATA.Title ? (title ? ' - ' : '') + RL_APP_DATA.Title : ''),
 
 	initData: appData => {
 		RL_APP_DATA = appData;
 		const url = appData.StaticLibsJs,
-			cb = () => rl.app ? rl.app.bootstart() : badBrowser();
+			cb = () => rl.app.bootstart();
 		loadScript(url)
 			.then(() => loadScript(url.replace('/libs.', `/${admin?'admin':'app'}.`)))
 			.then(() => appData.PluginsLink ? loadScript(appData.PluginsLink) : Promise.resolve())
diff --git a/dev/bootstrap.js b/dev/bootstrap.js
index 0b800da8b..23045c76a 100644
--- a/dev/bootstrap.js
+++ b/dev/bootstrap.js
@@ -4,18 +4,6 @@ import { i18n } from 'Common/Translator';
 import { root } from 'Common/Links';
 
 import { isArray } from 'Common/Utils';
-const FormDataToObject = formData => {
-	var object = {};
-	formData.forEach((value, key) => {
-		if (!Reflect.has(object, key)){
-			object[key] = value;
-		} else {
-			isArray(object[key]) || (object[key] = [object[key]]);
-			object[key].push(value);
-		}
-	});
-	return object;
-};
 
 export default App => {
 
@@ -57,7 +45,18 @@ export default App => {
 		if (postData) {
 			init.method = 'POST';
 			init.headers['Content-Type'] = 'application/json';
-			postData = (postData instanceof FormData) ? FormDataToObject(postData) : postData;
+			if (postData instanceof FormData) {
+				const object = {};
+				postData.forEach((value, key) => {
+					if (!Reflect.has(object, key)){
+						object[key] = value;
+					} else {
+						isArray(object[key]) || (object[key] = [object[key]]);
+						object[key].push(value);
+					}
+				});
+				postData = object;
+			}
 			postData.XToken = Settings.app('token');
 			init.body = JSON.stringify(postData);
 		}
diff --git a/dev/shortcuts.js b/dev/shortcuts.js
index 0ff31b78d..d993b7300 100644
--- a/dev/shortcuts.js
+++ b/dev/shortcuts.js
@@ -56,6 +56,7 @@ const
 		setScope: value => {
 			_scope = value || 'all';
 			scope = _scopes[_scope] || {};
+			console.log('Shortcuts scope set to: ' + _scope);
 		},
 		getScope: () => _scope,
 		getMetaKey: () => 'meta' === meta ? '⌘' : 'Ctrl'
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 8e5017ec7..a182909e6 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.20.6</upstream>.
+This app packages SnappyMail <upstream>2.22.2</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 94afd7e11..d1d70f1ad 100644
--- a/integrations/cloudron/Dockerfile
+++ b/integrations/cloudron/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir -p /app/code
 WORKDIR /app/code
 
 # If you change the extraction below, be sure to test on scaleway
-VERSION=2.20.6
+VERSION=2.22.2
 RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
     unzip /tmp/snappymail.zip -d /app/code && \
     rm /tmp/snappymail.zip && \
diff --git a/integrations/cpanel/var/cpanel/webmail/webmail_snappymail.yaml b/integrations/cpanel/var/cpanel/webmail/webmail_snappymail.yaml
new file mode 100644
index 000000000..682f79565
--- /dev/null
+++ b/integrations/cpanel/var/cpanel/webmail/webmail_snappymail.yaml
@@ -0,0 +1,3 @@
+url: "/3rdparty/snappymail/?RemoteAutoLogin"
+displayname: "SnappyMail"
+icon: "/3rdparty/snappymail/snappymail/v/2.22.1/static/logo-text.png"
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 4d12626cc..5f121a00f 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>snappymail</id>
 	<name>SnappyMail</name>
 	<summary>SnappyMail Webmail</summary>
-	<version>2.20.6</version>
+	<version>2.22.2</version>
 	<licence>agpl</licence>
 	<author>SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
 	<description><![CDATA[**Simple, modern, lightweight & fast web-based email client.**
diff --git a/integrations/nextcloud/snappymail/css/embed.css b/integrations/nextcloud/snappymail/css/embed.css
index 0df67cffa..150a27fe9 100644
--- a/integrations/nextcloud/snappymail/css/embed.css
+++ b/integrations/nextcloud/snappymail/css/embed.css
@@ -10,32 +10,6 @@ This stylesheet is used when SnappyMail runs in embed mode.
 	min-height: 100%;
 }
 
-#content[class*="app-"] #rl-app * {
-	box-sizing: content-box;
-}
-#content[class*="app-"] #rl-app #V-Settings-Domains .domain-name,
-#content[class*="app-"] #rl-app #V-Settings-Domains .domain-alias
-#content[class*="app-"] #rl-app #rl-settings-subscreen,
-#content[class*="app-"] #rl-app .e-checkbox.material-design > div > div,
-#content[class*="app-"] #rl-app .attachmentItem .iconMain,
-#content[class*="app-"] #rl-app .attachmentItem .iconPreview,
-#content[class*="app-"] #rl-app #V-PopupsCompose .textAreaParent,
-#content[class*="app-"] #rl-app #V-PopupsCompose .attachmentAreaParent,
-#content[class*="app-"] #rl-app .emailaddresses,
-#content[class*="app-"] #rl-app .squire-wysiwyg,
-#content[class*="app-"] #rl-app .squire-plain,
-/* bootstrap */
-#content[class*="app-"] #rl-app .btn-block,
-#content[class*="app-"] #rl-app select,
-#content[class*="app-"] #rl-app .select,
-#content[class*="app-"] #rl-app textarea,
-#content[class*="app-"] #rl-app input,
-#content[class*="app-"] #rl-app .input-block-level,
-#content[class*="app-"] #rl-app .icon-spinner,
-#content[class*="app-"] #rl-app #V-AdminPane #rl-settings-subscreen
-{
-	box-sizing: border-box;
-}
 .squire-wysiwyg {
 	min-width: 100%;
 	min-height: 100%;
@@ -78,7 +52,6 @@ This stylesheet is used when SnappyMail runs in embed mode.
 }
 
 #rl-app .squire-plain, #rl-app .squire-wysiwyg {
-	box-sizing: border-box;
 	font-size: 13px;
 	height: 100%;
 	line-height: 16px;
@@ -105,6 +78,15 @@ body > header ul {
 	cursor: pointer;
 }
 
+/**
+ * Firefox < 98
+ * https://github.com/the-djmaze/snappymail/issues/673
+ */
+#rl-app dialog.polyfill {
+	margin-top: 50px;
+	max-height: calc(100vh - 60px);
+}
+
 /**
  * hampoelz
  * https://github.com/the-djmaze/snappymail/issues/96#issuecomment-1279783076
diff --git a/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php b/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
index 9ecf8e121..5a2d9bfba 100644
--- a/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
+++ b/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
@@ -9,7 +9,7 @@ class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy
 	/** @var bool Whether eval in JS scripts is allowed */
 	protected $evalScriptAllowed = true;
 	/** @var bool Whether strict-dynamic should be set */
-	protected $strictDynamicAllowed = true; // NC24+
+//	protected $strictDynamicAllowed = true; // NC24+
 	/** @var bool Whether inline CSS is allowed */
 	protected $inlineStyleAllowed = true;
 
@@ -21,9 +21,11 @@ class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy
 			$CSP->script
 		));
 		$this->allowedScriptDomains = \array_diff($this->allowedScriptDomains, ["'unsafe-inline'", "'unsafe-eval'"]);
-		if (\method_exists($this, 'useStrictDynamic')) {
-			$this->allowedScriptDomains = \array_diff($this->allowedScriptDomains, ["'strict-dynamic'"]);
-		}
+
+		// Nextcloud only sets 'strict-dynamic' when browserSupportsCspV3() ?
+		\method_exists($this, 'useStrictDynamic')
+			? $this->useStrictDynamic(true) // NC24+
+			: $this->addAllowedScriptDomain("'strict-dynamic'");
 
 		$this->allowedImageDomains = \array_unique(\array_merge(
 			$this->allowedImageDomains,
@@ -47,4 +49,16 @@ class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy
 		));
 	}
 
+	public function getSnappyMailNonce() {
+		static $sNonce;
+		if (!$sNonce) {
+			$cspManager = \OC::$server->getContentSecurityPolicyNonceManager();
+			$sNonce = $cspManager->getNonce() ?: \SnappyMail\UUID::generate();
+			if (\method_exists($cspManager, 'browserSupportsCspV3') && !$cspManager->browserSupportsCspV3()) {
+				$this->addAllowedScriptDomain("'nonce-{$sNonce}'");
+			}
+		}
+		return $sNonce;
+	}
+
 }
diff --git a/integrations/nextcloud/snappymail/lib/Controller/PageController.php b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
index 93341cda6..f64b53fea 100644
--- a/integrations/nextcloud/snappymail/lib/Controller/PageController.php
+++ b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
@@ -55,12 +55,8 @@ class PageController extends Controller
 		$sAppCssMin = $oConfig->Get('labs', 'use_app_debug_css', false) ? '' : '.min';
 		$sLanguage = $oActions->GetLanguage(false);
 
-		$cspManager = \OC::$server->getContentSecurityPolicyNonceManager();
-		$sNonce = $cspManager->getNonce() ?: \SnappyMail\UUID::generate();
 		$csp = new ContentSecurityPolicy();
-		if (\method_exists($cspManager, 'browserSupportsCspV3') && !$cspManager->browserSupportsCspV3()) {
-			$csp->addAllowedScriptDomain("'nonce-{$sNonce}'");
-		}
+		$sNonce = $csp->getSnappyMailNonce();
 
 		$params = [
 			'Admin' => $bAdmin ? 1 : 0,
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index 592be362c..4550166e3 100644
--- a/integrations/virtualmin/snappymail.pl
+++ b/integrations/virtualmin/snappymail.pl
@@ -20,7 +20,7 @@ return "SnappyMail Webmail is a browser-based multilingual IMAP client with an a
 # script_snappymail_versions()
 sub script_snappymail_versions
 {
-return ( "2.20.6" );
+return ( "2.22.2" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 8ca2c3024..69c348df1 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "title": "SnappyMail",
   "description": "Simple, modern & fast web-based email client",
   "private": true,
-  "version": "2.20.6",
+  "version": "2.22.2",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",
diff --git a/plugins/README.md b/plugins/README.md
index 64dd7944f..4201d6449 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -3,13 +3,84 @@ PHP
 class Plugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	public function __construct();
-	public function Name() : string;
-	public function Description() : string;
-	public function UseLangs(?bool $bLangs = null) : bool;
-	public function Supported() : string;
-	public function Init() : void;
-	public function FilterAppDataPluginSection(bool $bAdmin, bool $bAuth, array &$aConfig) : void;
-	protected function configMapping() : array;
+
+	/** Returns static::NAME */
+	public function Name(): string;
+
+	/** Returns /README file contents or static::DESCRIPTION */
+	public function Description(): string;
+
+	/** When $bLangs is boolean it sets the value, else returns current value */
+	public function UseLangs(?bool $bLangs = null): bool;
+
+	/** When true the result is empty string, else the error message */
+	public function Supported(): string;
+
+	/** Initialize settings */
+	public function Init(): void;
+
+	public function FilterAppDataPluginSection(bool $bAdmin, bool $bAuth, array &$aConfig): void;
+
+	/** Returns array of all plugin Property options for use in Admin -> Extensions -> Plugin cog wheel */
+	protected function configMapping(): array;
+
+	/** With this function you hook to an event
+	 * $sHookName see chapter "Hooks" below for available names
+	 * $sFunctionName the name of a function in this class
+	 */
+	final protected function addHook(string $sHookName, string $sFunctionName): self;
+
+	final protected function addCss(string $sFile, bool $bAdminScope = false): self;
+
+	final protected function addJs(string $sFile, bool $bAdminScope = false): self;
+
+	final protected function addTemplate(string $sFile, bool $bAdminScope = false): self;
+
+	final protected function addJsonHook(string $sActionName, string $sFunctionName): self;
+
+	/**
+	 * You may register your own service actions.
+	 * Url is like /?{actionname}/etc.
+	 * Predefined actions of \RainLoop\ServiceActions that can't be registered are:
+	 * - admin
+	 * - AdminAppData
+	 * - AppData
+	 * - Append
+	 * - Backup
+	 * - BadBrowser
+	 * - CspReport
+	 * - Css
+	 * - Json
+	 * - Lang
+	 * - Mailto
+	 * - NoCookie
+	 * - NoScript
+	 * - Ping
+	 * - Plugins
+	 * - ProxyExternal
+	 * - Raw
+	 * - Sso
+	 * - Upload
+	 * - UploadBackground
+	 * - UploadContacts
+	 */
+	final protected function addPartHook(string $sActionName, string $sFunctionName): self
+
+	final public function Config(): \RainLoop\Config\Plugin;
+	final public function Manager(): \RainLoop\Plugins\Manager;
+	final public function Path(): string;
+	final public function ConfigMap(bool $flatten = false): array;
+
+	/**
+	 * Returns result of Actions->DefaultResponse($sFunctionName, $mData) or json_encode($mData)
+	 */
+	final protected function jsonResponse(string $sFunctionName, $mData): mixed;
+
+	final public function jsonParam(string $sKey, $mDefault = null): mixed;
+
+	final public function getUserSettings(): array;
+
+	final public function saveUserSettings(array $aSettings): bool;
 }
 ```
 
@@ -72,53 +143,53 @@ $Plugin->addHook('hook.name', 'functionName');
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Imap\ImapClient $oImapClient
-		array &$aCredentials
+		\MailSo\Imap\Settings $oSettings
 
 ### imap.after-connect
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Imap\ImapClient $oImapClient
-		array $aCredentials
+		\MailSo\Imap\Settings $oSettings
 
 ### imap.before-login
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Imap\ImapClient $oImapClient
-		array &$aCredentials
+		\MailSo\Imap\Settings $oSettings
 
 ### imap.after-login
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Imap\ImapClient $oImapClient
 		bool $bSuccess
-		array $aCredentials
+		\MailSo\Imap\Settings $oSettings
 
 ## Sieve
 
 ### sieve.before-connect
 	params:
 		\RainLoop\Model\Account $oAccount
-		\MailSo\Sieve\ManageSieveClient $oSieveClient
-		array &$aCredentials
+		\MailSo\Sieve\SieveClient $oSieveClient
+		\MailSo\Sieve\Settings $oSettings
 
 ### sieve.after-connect
 	params:
 		\RainLoop\Model\Account $oAccount
-		\MailSo\Sieve\ManageSieveClient $oSieveClient
-		array $aCredentials
+		\MailSo\Sieve\SieveClient $oSieveClient
+		\MailSo\Sieve\Settings $oSettings
 
 ### sieve.before-login
 	params:
 		\RainLoop\Model\Account $oAccount
-		\MailSo\Sieve\ManageSieveClient $oSieveClient
-		array &$aCredentials
+		\MailSo\Sieve\SieveClient $oSieveClient
+		\MailSo\Sieve\Settings $oSettings
 
 ### sieve.after-login
 	params:
 		\RainLoop\Model\Account $oAccount
-		\MailSo\Sieve\ManageSieveClient $oSieveClient
+		\MailSo\Sieve\SieveClient $oSieveClient
 		bool $bSuccess
-		array $aCredentials
+		\MailSo\Sieve\Settings $oSettings
 
 ## SMTP
 
@@ -126,26 +197,26 @@ $Plugin->addHook('hook.name', 'functionName');
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Smtp\SmtpClient $oSmtpClient
-		array &$aCredentials
+		\MailSo\Smtp\Settings $oSettings
 
 ### smtp.after-connect
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Smtp\SmtpClient $oSmtpClient
-		array $aCredentials
+		\MailSo\Smtp\Settings $oSettings
 
 ### smtp.before-login
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Smtp\SmtpClient $oSmtpClient
-		array &$aCredentials
+		\MailSo\Smtp\Settings $oSettings
 
 ### smtp.after-login
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Smtp\SmtpClient $oSmtpClient
 		bool $bSuccess
-		array $aCredentials
+		\MailSo\Smtp\Settings $oSettings
 
 ## Folders
 
diff --git a/plugins/auto-domain-grab/index.php b/plugins/auto-domain-grab/index.php
index 58999f66b..ee2458948 100644
--- a/plugins/auto-domain-grab/index.php
+++ b/plugins/auto-domain-grab/index.php
@@ -15,8 +15,9 @@ class AutoDomainGrabPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'Auto Domain Selection',
-		VERSION  = '2.8',
-		REQUIRED = '2.8.0',
+		VERSION  = '2.9',
+		RELEASE = '2022-11-11',
+		REQUIRED = '2.21.0',
 		CATEGORY = 'General',
 		DESCRIPTION = 'Sets the IMAP/SMTP host based on the user\'s login';
 
@@ -32,20 +33,20 @@ class AutoDomainGrabPlugin extends \RainLoop\Plugins\AbstractPlugin
 	/**
 	 * This function detects the IMAP Host, and if it is set to 'auto', replaces it with the MX or email domain.
 	 */
-	public function FilterImapCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Imap\ImapClient $oImapClient, array &$aImapCredentials)
+	public function FilterImapCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Imap\ImapClient $oImapClient, \MailSo\Imap\Settings $oSettings)
 	{
 		// Check for mail.$DOMAIN as entered value in RL settings
-		if (!empty($aImapCredentials['Host']) && 'auto' === $aImapCredentials['Host'])
+		if ('auto' === $oSettings->host)
 		{
 			$domain = \substr(\strrchr($oAccount->Email(), '@'), 1);
 			$mxhosts = array();
 			if (\getmxrr($domain, $mxhosts) && $mxhosts)
 			{
-				$aImapCredentials['Host'] = $mxhosts[0];
+				$oSettings->host = $mxhosts[0];
 			}
 			else
 			{
-				$aImapCredentials['Host'] = $this->imap_prefix.$domain;
+				$oSettings->host = $this->imap_prefix.$domain;
 			}
 		}
 	}
@@ -53,20 +54,20 @@ class AutoDomainGrabPlugin extends \RainLoop\Plugins\AbstractPlugin
 	/**
 	 * This function detects the SMTP Host, and if it is set to 'auto', replaces it with the MX or email domain.
 	 */
-	public function FilterSmtpCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Smtp\SmtpClient $oSmtpClient, array &$aSmtpCredentials)
+	public function FilterSmtpCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Smtp\SmtpClient $oSmtpClient, \MailSo\Smtp\Settings $oSettings)
 	{
 		// Check for mail.$DOMAIN as entered value in RL settings
-		if (!empty($aSmtpCredentials['Host']) && 'auto' === $aSmtpCredentials['Host'])
+		if ('auto' === $oSettings->host)
 		{
 			$domain = \substr(\strrchr($oAccount->Email(), '@'), 1);
 			$mxhosts = array();
 			if (\getmxrr($domain, $mxhosts) && $mxhosts)
 			{
-				$aSmtpCredentials['Host'] = $mxhosts[0];
+				$oSettings->host = $mxhosts[0];
 			}
 			else
 			{
-				$aSmtpCredentials['Host'] = $this->smtp_prefix . $domain;
+				$oSettings->host = $this->smtp_prefix . $domain;
 			}
 		}
 	}
diff --git a/plugins/avatars/LICENSE b/plugins/avatars/LICENSE
new file mode 100644
index 000000000..f709b02e2
--- /dev/null
+++ b/plugins/avatars/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/avatars/avatars.js b/plugins/avatars/avatars.js
new file mode 100644
index 000000000..ba872301e
--- /dev/null
+++ b/plugins/avatars/avatars.js
@@ -0,0 +1,100 @@
+(rl => {
+//	if (rl.settings.get('Nextcloud'))
+	const
+		queue = [],
+		avatars = new Map,
+		templateId = 'MailMessageView',
+		getAvatarUid = msg => {
+			let from = msg.from[0],
+				bimi = 'pass' == from.dkimStatus ? 1 : 0;
+			return `${bimi}/${from.email.toLowerCase()}`;
+		},
+		getAvatar = msg => avatars.get(getAvatarUid(msg)),
+		runQueue = (() => {
+			let item = queue.shift();
+			while (item) {
+				let url = getAvatar(item[0]);
+				if (url) {
+					item[1](url);
+					item = queue.shift();
+				} else {
+					// TODO: fetch vCard from Nextcloud contacts
+//					let cfg = rl.settings.get('Nextcloud'),
+
+					let from = item[0].from[0];
+					rl.pluginRemoteRequest((iError, data) => {
+						if (!iError && data?.Result.type) {
+							url = `data:${data.Result.type};base64,${data.Result.data}`;
+							avatars.set(getAvatarUid(item[0]), url);
+							item[1](url);
+						}
+						runQueue();
+					}, 'Avatar', {
+						bimi: 'pass' == from.dkimStatus ? 1 : 0,
+						email: from.email
+					});
+					break;
+				}
+			}
+		}).debounce(1000);
+
+	ko.bindingHandlers.fromPic = {
+		init: (element, self, dummy, msg) => {
+			if (msg) {
+				let url = getAvatar(msg),
+					fn = url=>{element.src = url};
+				if (url) {
+					fn(url);
+				} else {
+					queue.push([msg, fn]);
+					runQueue();
+				}
+			}
+		}
+	};
+
+	addEventListener('rl-view-model.create', e => {
+		if (templateId === e.detail.viewModelTemplateID) {
+
+			const
+				template = document.getElementById(templateId),
+				messageItemHeader = template.content.querySelector('.messageItemHeader');
+
+			if (messageItemHeader) {
+				messageItemHeader.prepend(Element.fromHTML(
+					`<img class="fromPic" data-bind="visible: viewUserPicVisible, attr: {'src': viewUserPic() }">`
+				));
+			}
+
+			let view = e.detail;
+			view.viewUserPic = ko.observable('');
+			view.viewUserPicVisible = ko.observable(false);
+
+			view.message.subscribe(msg => {
+				view.viewUserPicVisible(false);
+				if (msg) {
+					let url = getAvatar(msg),
+						fn = url => {
+							view.viewUserPic(url);
+							view.viewUserPicVisible(true);
+						};
+					if (url) {
+						fn(url);
+					} else {
+//						let from = msg.from[0], bimi = 'pass' == from.dkimStatus ? 1 : 0;
+//						view.viewUserPic(`?Avatar/${bimi}/${encodeURIComponent(from.email)}`);
+//						view.viewUserPicVisible(true);
+						queue.push([msg, fn]);
+						runQueue();
+					}
+				}
+			});
+		}
+
+		if ('MailMessageList' === e.detail.viewModelTemplateID) {
+			document.getElementById('MailMessageList').content.querySelector('.messageCheckbox')
+				.append(Element.fromHTML(`<img class="fromPic" data-bind="fromPic:$data">`));
+		}
+	});
+
+})(window.rl);
diff --git a/plugins/avatars/images/empty-contact.png b/plugins/avatars/images/empty-contact.png
new file mode 100644
index 000000000..4418810b8
Binary files /dev/null and b/plugins/avatars/images/empty-contact.png differ
diff --git a/plugins/avatars/images/services/amazon.com.png b/plugins/avatars/images/services/amazon.com.png
new file mode 100644
index 000000000..adfc6f526
Binary files /dev/null and b/plugins/avatars/images/services/amazon.com.png differ
diff --git a/plugins/avatars/images/services/apple.com.png b/plugins/avatars/images/services/apple.com.png
new file mode 100644
index 000000000..31ca5e8fd
Binary files /dev/null and b/plugins/avatars/images/services/apple.com.png differ
diff --git a/plugins/avatars/images/services/asana.com.png b/plugins/avatars/images/services/asana.com.png
new file mode 100644
index 000000000..35d3e1db5
Binary files /dev/null and b/plugins/avatars/images/services/asana.com.png differ
diff --git a/plugins/avatars/images/services/battle.net.png b/plugins/avatars/images/services/battle.net.png
new file mode 100644
index 000000000..f5baf8db8
Binary files /dev/null and b/plugins/avatars/images/services/battle.net.png differ
diff --git a/plugins/avatars/images/services/blizzard.com.png b/plugins/avatars/images/services/blizzard.com.png
new file mode 100644
index 000000000..f5baf8db8
Binary files /dev/null and b/plugins/avatars/images/services/blizzard.com.png differ
diff --git a/plugins/avatars/images/services/ea.com.png b/plugins/avatars/images/services/ea.com.png
new file mode 100644
index 000000000..e88b641c6
Binary files /dev/null and b/plugins/avatars/images/services/ea.com.png differ
diff --git a/plugins/avatars/images/services/ebay.com.png b/plugins/avatars/images/services/ebay.com.png
new file mode 100644
index 000000000..b38920ca3
Binary files /dev/null and b/plugins/avatars/images/services/ebay.com.png differ
diff --git a/plugins/avatars/images/services/facebook.com.png b/plugins/avatars/images/services/facebook.com.png
new file mode 100644
index 000000000..2d416f898
Binary files /dev/null and b/plugins/avatars/images/services/facebook.com.png differ
diff --git a/plugins/avatars/images/services/github.com.png b/plugins/avatars/images/services/github.com.png
new file mode 100644
index 000000000..6e3f84247
Binary files /dev/null and b/plugins/avatars/images/services/github.com.png differ
diff --git a/plugins/avatars/images/services/google.com.png b/plugins/avatars/images/services/google.com.png
new file mode 100644
index 000000000..7f6262573
Binary files /dev/null and b/plugins/avatars/images/services/google.com.png differ
diff --git a/plugins/avatars/images/services/microsoft.com.png b/plugins/avatars/images/services/microsoft.com.png
new file mode 100644
index 000000000..bfe230d86
Binary files /dev/null and b/plugins/avatars/images/services/microsoft.com.png differ
diff --git a/plugins/avatars/images/services/onlive.com.png b/plugins/avatars/images/services/onlive.com.png
new file mode 100644
index 000000000..8207cd108
Binary files /dev/null and b/plugins/avatars/images/services/onlive.com.png differ
diff --git a/plugins/avatars/images/services/paypal.com.png b/plugins/avatars/images/services/paypal.com.png
new file mode 100644
index 000000000..7ddea03c9
Binary files /dev/null and b/plugins/avatars/images/services/paypal.com.png differ
diff --git a/plugins/avatars/images/services/skype.com.png b/plugins/avatars/images/services/skype.com.png
new file mode 100644
index 000000000..881b13cf8
Binary files /dev/null and b/plugins/avatars/images/services/skype.com.png differ
diff --git a/plugins/avatars/images/services/steampowered.com.png b/plugins/avatars/images/services/steampowered.com.png
new file mode 100644
index 000000000..de6107010
Binary files /dev/null and b/plugins/avatars/images/services/steampowered.com.png differ
diff --git a/plugins/avatars/images/services/ted.com.png b/plugins/avatars/images/services/ted.com.png
new file mode 100644
index 000000000..bcc26f3b5
Binary files /dev/null and b/plugins/avatars/images/services/ted.com.png differ
diff --git a/plugins/avatars/images/services/twitter.com.png b/plugins/avatars/images/services/twitter.com.png
new file mode 100644
index 000000000..18112e856
Binary files /dev/null and b/plugins/avatars/images/services/twitter.com.png differ
diff --git a/plugins/avatars/images/services/youtube.com.png b/plugins/avatars/images/services/youtube.com.png
new file mode 100644
index 000000000..6bb581790
Binary files /dev/null and b/plugins/avatars/images/services/youtube.com.png differ
diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php
new file mode 100644
index 000000000..fb3145bf9
--- /dev/null
+++ b/plugins/avatars/index.php
@@ -0,0 +1,196 @@
+<?php
+
+class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Avatar',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '1.0',
+		RELEASE  = '2022-11-23',
+		REQUIRED = '2.22.0',
+		CATEGORY = 'Contacts',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Show photo of sender in message and messages list (supports BIMI and Gravatar, Contacts is still TODO)';
+
+	public function Init() : void
+	{
+		$this->addCss('style.css');
+		$this->addJs('avatars.js');
+		$this->addJsonHook('Avatar', 'DoAvatar');
+		$this->addPartHook('Avatar', 'ServiceAvatar');
+	}
+
+	/**
+	 * POST method handling
+	 */
+	public function DoAvatar() : array
+	{
+		$bBimi = !empty($this->jsonParam('bimi'));
+		$sEmail = $this->jsonParam('email');
+		$aResult = $this->getAvatar(\urldecode($sEmail), !empty($sEmail));
+		if ($aResult) {
+			$aResult = [
+				'type' => $aResult[0],
+				'data' => \base64_encode($aResult[1])
+			];
+		}
+		return $this->jsonResponse(__FUNCTION__, $aResult);
+	}
+
+	/**
+	 * GET /?Avatar/${bimi}/${from.email}
+	 * Not fond of this idea because email address is exposed
+	 * Maybe use btoa(from.email) or Crypto.subtle.encrypt({name:'AES-GCM',iv:''}, token, from.email)
+	 */
+//	public function ServiceAvatar(...$aParts)
+	public function ServiceAvatar(string $sServiceName, string $sBimi, string $sEmail)
+	{
+		$aResult = $this->getAvatar(\urldecode($sEmail), !empty($sEmail));
+		if ($aResult) {
+			\header('Content-Type: '.$aResult[0]);
+			echo $aResult[1];
+			return true;
+		}
+		return false;
+	}
+
+	protected function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('bimi')->SetLabel('Use BIMI (https://bimigroup.org/)')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDefaultValue(false),
+			\RainLoop\Plugins\Property::NewInstance('gravatar')->SetLabel('Use Gravatar')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDefaultValue(false)
+		);
+	}
+
+	private function getAvatar(string $sEmail, bool $bBimi) : ?array
+	{
+		if (!\strpos($sEmail, '@')) {
+			return null;
+		}
+
+		$oActions = \RainLoop\Api::Actions();
+		$oActions->verifyCacheByKey($sEmail);
+
+		$aResult = null;
+
+		$sAsciiEmail = \MailSo\Base\Utils::IdnToAscii($sEmail, true);
+		$sEmailId = \sha1(\strtolower($sAsciiEmail));
+
+		$sFile = \APP_PRIVATE_DATA . 'avatars/' . $sEmailId;
+		$aFiles = \glob("{$sFile}.*");
+		if ($aFiles) {
+			$aResult = [
+				\mime_content_type($aFiles[0]),
+				\file_get_contents($aFiles[0])
+			];
+			$oActions->cacheByKey($sEmail);
+			return $aResult;
+		}
+
+		// TODO: lookup contacts vCard and return PHOTO value
+		/*
+		if (!$aResult) {
+			$oAccount = $oActions->getAccountFromToken();
+			if ($oAccount) {
+				$oAddressBookProvider = $oActions->AddressBookProvider($oAccount);
+				if ($oAddressBookProvider) {
+					$oContact = $oAddressBookProvider->GetContactByEmail($sEmail);
+					if ($oContact && $oContact->vCard && $oContact->vCard['PHOTO']) {
+						$aResult = [
+							'text/vcard',
+							$oContact->vCard
+						];
+					}
+				}
+			}
+		}
+		*/
+
+		if (!$aResult) {
+			$sDomain = \explode('@', $sEmail);
+			$sDomain = \array_pop($sDomain);
+
+			$aUrls = [];
+
+			if ($this->Config()->Get('plugin', 'bimi', false)) {
+				$BIMI = $bBimi ? \SnappyMail\DNS::BIMI($sDomain) : null;
+				if ($BIMI) {
+					$aUrls[] = $BIMI;
+//					$aResult = ['text/uri-list', $BIMI];
+					\SnappyMail\Log::debug('Avatar', "BIMI {$sDomain} for {$sUrl}");
+				} else {
+					\SnappyMail\Log::notice('Avatar', "BIMI 404 for {$sDomain}");
+				}
+			}
+
+			if ($this->Config()->Get('plugin', 'gravatar', false)) {
+				$aUrls[] = 'http://gravatar.com/avatar/'.\md5(\strtolower($sAsciiEmail)).'?s=80&d=404';
+			}
+
+			foreach ($aUrls as $sUrl) {
+				if ($aResult = static::getUrl($sUrl)) {
+					break;
+				}
+			}
+		}
+
+		if ($aResult) {
+			if (!\is_dir(\APP_PRIVATE_DATA . 'avatars')) {
+				\mkdir(\APP_PRIVATE_DATA . 'avatars', 0700);
+			}
+			\file_put_contents(
+				$sFile . \SnappyMail\File\MimeType::toExtension($aResult[0]),
+				$aResult[1]
+			);
+		}
+
+		if (!$aResult) {
+			$aServices = [
+				"services/{$sDomain}",
+				'services/' . \preg_replace('/^.+\\.([^.]+\\.[^.]+)$/D', '$1', $sDomain),
+				'services/' . \preg_replace('/^(.+\\.)?(paypal\\.[a-z][a-z])$/D', 'paypal.com', $sDomain),
+				'empty-contact' // DATA_IMAGE_USER_DOT_PIC
+			];
+			foreach ($aServices as $service) {
+				if (\file_exists(__DIR__ . "/images/{$service}.png")) {
+					$aResult = [
+						'image/png',
+						\file_get_contents(__DIR__ . "/images/{$service}.png")
+					];
+					break;
+				}
+			}
+		}
+
+		$oActions->cacheByKey($sEmail);
+
+		return $aResult;
+	}
+
+	private static function getUrl(string $sUrl) : ?array
+	{
+		$oHTTP = \SnappyMail\HTTP\Request::factory(/*'socket' or 'curl'*/);
+		$oHTTP->proxy = \RainLoop\Api::Config()->Get('labs', 'curl_proxy', '');
+		$oHTTP->proxy_auth = \RainLoop\Api::Config()->Get('labs', 'curl_proxy_auth', '');
+		$oHTTP->max_response_kb = 0;
+		$oHTTP->timeout = 15; // timeout in seconds.
+		$oResponse = $oHTTP->doRequest('GET', $sUrl);
+		if ($oResponse) {
+			if (200 === $oResponse->status && \str_starts_with($oResponse->getHeader('content-type'), 'image/')) {
+				return [
+					$oResponse->getHeader('content-type'),
+					$oResponse->body
+				];
+			}
+			\SnappyMail\Log::notice('Avatar', "error {$oResponse->status} for {$sUrl}");
+		} else {
+			\SnappyMail\Log::warning('Avatar', "failed for {$sUrl}");
+		}
+		return null;
+	}
+}
diff --git a/plugins/avatars/style.css b/plugins/avatars/style.css
new file mode 100644
index 000000000..e2e21bac4
--- /dev/null
+++ b/plugins/avatars/style.css
@@ -0,0 +1,25 @@
+.messageView .fromPic {
+	border: 1px solid var(--border-color, #ddd);
+	float: left;
+	width: 50px;
+	height: 50px;
+	margin: 0 4px 0 0;
+	padding: 1px;
+	border-radius: var(--border-radius, 5px);
+}
+/*
+.checkboxMessage {
+	background: #000 no-repeat center / contain;
+	background: #000 no-repeat right / 32px;
+	width:68px
+}
+*/
+#rl-app .messageCheckbox {
+	padding-right:0;
+	white-space:nowrap;
+}
+.messageCheckbox .fromPic {
+	margin: 0 0 -0.4em 0.4em;
+	height: 1.5em;
+	max-width: 1.5em;
+}
diff --git a/plugins/demo-account/index.php b/plugins/demo-account/index.php
index 84fdca8b2..1645fdc6b 100644
--- a/plugins/demo-account/index.php
+++ b/plugins/demo-account/index.php
@@ -42,7 +42,7 @@ class DemoAccountPlugin extends \RainLoop\Plugins\AbstractPlugin
 	{
 		if (!$bAdmin && \is_array($aResult) && empty($aResult['Auth'])) {
 			$aResult['DevEmail'] = $this->Config()->Get('plugin', 'email', $aResult['DevEmail']);
-			$aResult['DevPassword'] = APP_DUMMY;
+			$aResult['DevPassword'] = '********';
 		}
 	}
 
diff --git a/plugins/demo-account/storage.php b/plugins/demo-account/storage.php
index fa9e54bbb..af4634530 100644
--- a/plugins/demo-account/storage.php
+++ b/plugins/demo-account/storage.php
@@ -35,8 +35,13 @@ class DemoStorage extends \RainLoop\Providers\Storage\FileStorage
 		if (!\is_dir($sDataPath) && \mkdir($sDataPath, 0700, true)) {
 			\file_put_contents("{$sDataPath}/settings",'{"RemoveColors":true,"ListInlineAttachments":true}');
 			if (\mkdir($sDataPath.'/.gnupg/private-keys-v1.d', 0700, true)) {
+				// AES
+				\file_put_contents("{$sDataPath}/.gnupg/private-keys-v1.d/3106F4281F98D820114228FEF16B5BA0D78AA005.key",file_get_contents("{$this->sDataPath}/demo.pgp/.gnupg/private-keys-v1.d/3106F4281F98D820114228FEF16B5BA0D78AA005.key"));
+				\file_put_contents("{$sDataPath}/.gnupg/private-keys-v1.d/82CA239C482423D364BFD6DFC3E400B3B98AD66F.key",file_get_contents("{$this->sDataPath}/demo.pgp/.gnupg/private-keys-v1.d/82CA239C482423D364BFD6DFC3E400B3B98AD66F.key"));
+				// ECC
 				\file_put_contents("{$sDataPath}/.gnupg/private-keys-v1.d/5A1A6C7310D0508C68E8E74F15068301E83FD1AE.key",file_get_contents("{$this->sDataPath}/demo.pgp/.gnupg/private-keys-v1.d/5A1A6C7310D0508C68E8E74F15068301E83FD1AE.key"));
 				\file_put_contents("{$sDataPath}/.gnupg/private-keys-v1.d/886921A7E06BE56F8E8C51797BB476BB26DF21BF.key",file_get_contents("{$this->sDataPath}/demo.pgp/.gnupg/private-keys-v1.d/886921A7E06BE56F8E8C51797BB476BB26DF21BF.key"));
+
 				\file_put_contents("{$sDataPath}/.gnupg/pubring.kbx",file_get_contents("{$this->sDataPath}/demo.pgp/.gnupg/pubring.kbx"));
 				\file_put_contents("{$sDataPath}/.gnupg/trustdb.gpg",file_get_contents("{$this->sDataPath}/demo.pgp/.gnupg/trustdb.gpg"));
 			}
diff --git a/plugins/kolab/KolabAddressBook.php b/plugins/kolab/KolabAddressBook.php
index 64c058e09..89b704227 100644
--- a/plugins/kolab/KolabAddressBook.php
+++ b/plugins/kolab/KolabAddressBook.php
@@ -313,6 +313,12 @@ class KolabAddressBook implements \RainLoop\Providers\AddressBook\AddressBookInt
 		return $aResult;
 	}
 
+	public function GetContactByEmail(string $sEmail) : ?Contact;
+	{
+		// TODO
+		return null;
+	}
+
 	public function GetContactByID($mID, bool $bIsStrID = false) : ?Contact
 	{
 		if ($bIsStrID) {
diff --git a/plugins/kolab/index.php b/plugins/kolab/index.php
index 84902031a..4528ab981 100644
--- a/plugins/kolab/index.php
+++ b/plugins/kolab/index.php
@@ -4,11 +4,11 @@ class KolabPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Kolab',
-		VERSION = '2.0',
-		RELEASE  = '2022-09-06',
+		VERSION = '2.1',
+		RELEASE  = '2022-11-23',
 		CATEGORY = 'Contacts',
 		DESCRIPTION = 'Use an Address Book of Kolab.',
-		REQUIRED = '2.18.0';
+		REQUIRED = '2.22.0';
 
 	public function Init() : void
 	{
diff --git a/plugins/login-external-sso/LICENSE b/plugins/login-external-sso/LICENSE
new file mode 100644
index 000000000..f709b02e2
--- /dev/null
+++ b/plugins/login-external-sso/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/login-external-sso/index.php b/plugins/login-external-sso/index.php
new file mode 100644
index 000000000..f3a215b04
--- /dev/null
+++ b/plugins/login-external-sso/index.php
@@ -0,0 +1,56 @@
+<?php
+
+class LoginExternalSsoPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Login External SSO',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '1.0',
+		RELEASE  = '2022-11-11',
+		REQUIRED = '2.21.0',
+		CATEGORY = 'Login',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Login with $_POST "Email", "Password" and "SsoKey". It returns an SSO hash to use with "?Sso&hash="';
+
+	public function Init() : void
+	{
+		$this->addPartHook('ExternalSso', 'ServiceExternalSso');
+	}
+
+	public function ServiceExternalSso() : string
+	{
+		$oActions = \RainLoop\Api::Actions();
+		$oActions->Http()->ServerNoCache();
+		$sKey = $this->Config()->Get('plugin', 'key', '');
+		$sEmail = isset($_POST['Email']) ? $_POST['Email'] : '';
+		$sPassword = isset($_POST['Password']) ? $_POST['Password'] : '';
+		if ($sEmail && $sPassword && $sKey && isset($_POST['SsoKey']) && $_POST['SsoKey'] == $sKey) {
+			$sResult = \RainLoop\Api::CreateUserSsoHash($sEmail, $sPassword);
+			if (isset($_POST['Output']) && 'json' === \strtolower($_POST['Output'])) {
+				\header('Content-Type: application/json; charset=utf-8');
+				echo \json_encode(array(
+					'Action' => 'ExternalSso',
+					'Result' => $sResult
+				));
+			} else {
+				\header('Content-Type: text/plain');
+				echo $sResult;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function configMapping() : array
+	{
+		return array(
+			// Was application.ini external_sso_key
+			\RainLoop\Plugins\Property::NewInstance('key')->SetLabel('SSO key')
+				->SetDefaultValue(''),
+		);
+	}
+
+}
diff --git a/plugins/login-external/LICENSE b/plugins/login-external/LICENSE
new file mode 100644
index 000000000..f709b02e2
--- /dev/null
+++ b/plugins/login-external/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/login-external/index.php b/plugins/login-external/index.php
new file mode 100644
index 000000000..5a9d2ae59
--- /dev/null
+++ b/plugins/login-external/index.php
@@ -0,0 +1,68 @@
+<?php
+
+class LoginExternalPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Login External',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '1.0',
+		RELEASE  = '2022-11-11',
+		REQUIRED = '2.21.0',
+		CATEGORY = 'Login',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Login with $_POST["Email"] and $_POST["Password"] from anywhere';
+
+	public function Init() : void
+	{
+		$this->addPartHook('ExternalLogin', 'ServiceExternalLogin');
+	}
+
+	public function ServiceExternalLogin() : bool
+	{
+		$oActions = \RainLoop\Api::Actions();
+		$oActions->Http()->ServerNoCache();
+
+		$oAccount = null;
+		$oException = null;
+
+		$sEmail = isset($_POST['Email']) ? $_POST['Email'] : '';
+		$sPassword = isset($_POST['Password']) ? $_POST['Password'] : '';
+
+		try
+		{
+			$oAccount = $oActions->LoginProcess($sEmail, $sPassword);
+			if ($oAccount instanceof \RainLoop\Model\MainAccount) {
+				$oActions->SetAuthToken($oAccount);
+			} else {
+				$oAccount = null;
+			}
+		}
+		catch (\Throwable $oException)
+		{
+			$oLogger = $oActions->Logger();
+			$oLogger && $oLogger->WriteException($oException);
+		}
+
+		if (isset($_POST['Output']) && 'json' === \strtolower($_POST['Output'])) {
+			\header('Content-Type: application/json; charset=utf-8');
+			$aResult = array(
+				'Action' => 'ExternalLogin',
+				'Result' => $oAccount ? true : false,
+				'ErrorCode' => 0
+			);
+			if (!$oAccount) {
+				if ($oException instanceof \RainLoop\Exceptions\ClientException) {
+					$aResult['ErrorCode'] = $oException->getCode();
+				} else {
+					$aResult['ErrorCode'] = Notifications::AuthError;
+				}
+			}
+			echo Utils::jsonEncode($aResult);
+		} else {
+			$oActions->Location('./');
+		}
+		return true;
+	}
+
+}
diff --git a/plugins/login-oauth2/OAuth2/Client.php b/plugins/login-oauth2/OAuth2/Client.php
new file mode 100644
index 000000000..46f34c42f
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/Client.php
@@ -0,0 +1,526 @@
+<?php
+/**
+ * Note : Code is released under the GNU LGPL
+ *
+ * Please do not change the header of this file
+ *
+ * This library is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * Lesser General Public License as published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU Lesser General Public License for more details.
+ */
+
+/**
+ * Light PHP wrapper for the OAuth 2.0 protocol.
+ *
+ * This client is based on the OAuth2 specification draft v2.15
+ * http://tools.ietf.org/html/draft-ietf-oauth-v2-15
+ *
+ * @author      Pierrick Charron <pierrick@webstart.fr>
+ * @author      Anis Berejeb <anis.berejeb@gmail.com>
+ * @version     1.3.1-dev
+ */
+namespace OAuth2;
+
+class Client
+{
+    /**
+     * Different AUTH method
+     */
+    const AUTH_TYPE_URI                 = 0;
+    const AUTH_TYPE_AUTHORIZATION_BASIC = 1;
+    const AUTH_TYPE_FORM                = 2;
+
+    /**
+     * Different Access token type
+     */
+    const ACCESS_TOKEN_URI      = 0;
+    const ACCESS_TOKEN_BEARER   = 1;
+    const ACCESS_TOKEN_OAUTH    = 2;
+    const ACCESS_TOKEN_MAC      = 3;
+
+    /**
+    * Different Grant types
+    */
+    const GRANT_TYPE_AUTH_CODE          = 'authorization_code';
+    const GRANT_TYPE_PASSWORD           = 'password';
+    const GRANT_TYPE_CLIENT_CREDENTIALS = 'client_credentials';
+    const GRANT_TYPE_REFRESH_TOKEN      = 'refresh_token';
+
+    /**
+     * HTTP Methods
+     */
+    const HTTP_METHOD_GET    = 'GET';
+    const HTTP_METHOD_POST   = 'POST';
+    const HTTP_METHOD_PUT    = 'PUT';
+    const HTTP_METHOD_DELETE = 'DELETE';
+    const HTTP_METHOD_HEAD   = 'HEAD';
+    const HTTP_METHOD_PATCH   = 'PATCH';
+
+    /**
+     * HTTP Form content types
+     */
+    const HTTP_FORM_CONTENT_TYPE_APPLICATION = 0;
+    const HTTP_FORM_CONTENT_TYPE_MULTIPART = 1;
+
+    /**
+     * Client ID
+     *
+     * @var string
+     */
+    protected $client_id = null;
+
+    /**
+     * Client Secret
+     *
+     * @var string
+     */
+    protected $client_secret = null;
+
+    /**
+     * Client Authentication method
+     *
+     * @var int
+     */
+    protected $client_auth = self::AUTH_TYPE_URI;
+
+    /**
+     * Access Token
+     *
+     * @var string
+     */
+    protected $access_token = null;
+
+    /**
+     * Access Token Type
+     *
+     * @var int
+     */
+    protected $access_token_type = self::ACCESS_TOKEN_URI;
+
+    /**
+     * Access Token Secret
+     *
+     * @var string
+     */
+    protected $access_token_secret = null;
+
+    /**
+     * Access Token crypt algorithm
+     *
+     * @var string
+     */
+    protected $access_token_algorithm = null;
+
+    /**
+     * Access Token Parameter name
+     *
+     * @var string
+     */
+    protected $access_token_param_name = 'access_token';
+
+    /**
+     * The path to the certificate file to use for https connections
+     *
+     * @var string  Defaults to .
+     */
+    protected $certificate_file = null;
+
+    /**
+     * cURL options
+     *
+     * @var array
+     */
+    protected $curl_options = array();
+
+    /**
+     * Construct
+     *
+     * @param string $client_id Client ID
+     * @param string $client_secret Client Secret
+     * @param int    $client_auth (AUTH_TYPE_URI, AUTH_TYPE_AUTHORIZATION_BASIC, AUTH_TYPE_FORM)
+     * @param string $certificate_file Indicates if we want to use a certificate file to trust the server. Optional, defaults to null.
+     * @return void
+     */
+    public function __construct($client_id, $client_secret, $client_auth = self::AUTH_TYPE_URI, $certificate_file = null)
+    {
+        if (!extension_loaded('curl')) {
+            throw new Exception('The PHP exention curl must be installed to use this library.', Exception::CURL_NOT_FOUND);
+        }
+
+        $this->client_id     = $client_id;
+        $this->client_secret = $client_secret;
+        $this->client_auth   = $client_auth;
+        $this->certificate_file = $certificate_file;
+        if (!empty($this->certificate_file)  && !is_file($this->certificate_file)) {
+            throw new InvalidArgumentException('The certificate file was not found', InvalidArgumentException::CERTIFICATE_NOT_FOUND);
+        }
+    }
+
+    /**
+     * Get the client Id
+     *
+     * @return string Client ID
+     */
+    public function getClientId()
+    {
+        return $this->client_id;
+    }
+
+    /**
+     * Get the client Secret
+     *
+     * @return string Client Secret
+     */
+    public function getClientSecret()
+    {
+        return $this->client_secret;
+    }
+
+    /**
+     * getAuthenticationUrl
+     *
+     * @param string $auth_endpoint Url of the authentication endpoint
+     * @param string $redirect_uri  Redirection URI
+     * @param array  $extra_parameters  Array of extra parameters like scope or state (Ex: array('scope' => null, 'state' => ''))
+     * @return string URL used for authentication
+     */
+    public function getAuthenticationUrl($auth_endpoint, $redirect_uri, array $extra_parameters = array())
+    {
+        $parameters = array_merge(array(
+            'response_type' => 'code',
+            'client_id'     => $this->client_id,
+            'redirect_uri'  => $redirect_uri
+        ), $extra_parameters);
+        return $auth_endpoint . '?' . http_build_query($parameters, '', '&');
+    }
+
+    /**
+     * getAccessToken
+     *
+     * @param string $token_endpoint    Url of the token endpoint
+     * @param string $grant_type        Grant Type ('authorization_code', 'password', 'client_credentials', 'refresh_token', or a custom code (@see GrantType Classes)
+     * @param array  $parameters        Array sent to the server (depend on which grant type you're using)
+     * @param array  $extra_headers     Array of extra headers
+     * @return array Array of parameters required by the grant_type (CF SPEC)
+     */
+    public function getAccessToken($token_endpoint, $grant_type, array $parameters, array $extra_headers = array())
+    {
+        if (!$grant_type) {
+            throw new InvalidArgumentException('The grant_type is mandatory.', InvalidArgumentException::INVALID_GRANT_TYPE);
+        }
+        $grantTypeClassName = $this->convertToCamelCase($grant_type);
+        $grantTypeClass =  __NAMESPACE__ . '\\GrantType\\' . $grantTypeClassName;
+        if (!class_exists($grantTypeClass)) {
+            throw new InvalidArgumentException('Unknown grant type \'' . $grant_type . '\'', InvalidArgumentException::INVALID_GRANT_TYPE);
+        }
+        $grantTypeObject = new $grantTypeClass();
+        $grantTypeObject->validateParameters($parameters);
+        if (!defined($grantTypeClass . '::GRANT_TYPE')) {
+            throw new Exception('Unknown constant GRANT_TYPE for class ' . $grantTypeClassName, Exception::GRANT_TYPE_ERROR);
+        }
+        $parameters['grant_type'] = $grantTypeClass::GRANT_TYPE;
+        $http_headers = $extra_headers;
+        switch ($this->client_auth) {
+            case self::AUTH_TYPE_URI:
+            case self::AUTH_TYPE_FORM:
+                $parameters['client_id'] = $this->client_id;
+                $parameters['client_secret'] = $this->client_secret;
+                break;
+            case self::AUTH_TYPE_AUTHORIZATION_BASIC:
+                $parameters['client_id'] = $this->client_id;
+                $http_headers['Authorization'] = 'Basic ' . base64_encode($this->client_id .  ':' . $this->client_secret);
+                break;
+            default:
+                throw new Exception('Unknown client auth type.', Exception::INVALID_CLIENT_AUTHENTICATION_TYPE);
+                break;
+        }
+
+        return $this->executeRequest($token_endpoint, $parameters, self::HTTP_METHOD_POST, $http_headers, self::HTTP_FORM_CONTENT_TYPE_APPLICATION);
+    }
+
+    /**
+     * setToken
+     *
+     * @param string $token Set the access token
+     * @return void
+     */
+    public function setAccessToken($token)
+    {
+        $this->access_token = $token;
+    }
+
+    /**
+     * Check if there is an access token present
+     *
+     * @return bool Whether the access token is present
+     */
+    public function hasAccessToken()
+    {
+        return !!$this->access_token;
+    }
+
+    /**
+     * Set the client authentication type
+     *
+     * @param string $client_auth (AUTH_TYPE_URI, AUTH_TYPE_AUTHORIZATION_BASIC, AUTH_TYPE_FORM)
+     * @return void
+     */
+    public function setClientAuthType($client_auth)
+    {
+        $this->client_auth = $client_auth;
+    }
+
+    /**
+     * Set an option for the curl transfer
+     *
+     * @param int   $option The CURLOPT_XXX option to set
+     * @param mixed $value  The value to be set on option
+     * @return void
+     */
+    public function setCurlOption($option, $value)
+    {
+        $this->curl_options[$option] = $value;
+    }
+
+    /**
+     * Set multiple options for a cURL transfer
+     *
+     * @param array $options An array specifying which options to set and their values
+     * @return void
+     */
+    public function setCurlOptions($options)
+    {
+        $this->curl_options = array_merge($this->curl_options, $options);
+    }
+
+    /**
+     * Set the access token type
+     *
+     * @param int $type Access token type (ACCESS_TOKEN_BEARER, ACCESS_TOKEN_MAC, ACCESS_TOKEN_URI)
+     * @param string $secret The secret key used to encrypt the MAC header
+     * @param string $algorithm Algorithm used to encrypt the signature
+     * @return void
+     */
+    public function setAccessTokenType($type, $secret = null, $algorithm = null)
+    {
+        $this->access_token_type = $type;
+        $this->access_token_secret = $secret;
+        $this->access_token_algorithm = $algorithm;
+    }
+
+    /**
+     * Fetch a protected ressource
+     *
+     * @param string $protected_ressource_url Protected resource URL
+     * @param array  $parameters Array of parameters
+     * @param string $http_method HTTP Method to use (POST, PUT, GET, HEAD, DELETE)
+     * @param array  $http_headers HTTP headers
+     * @param int    $form_content_type HTTP form content type to use
+     * @return array
+     */
+    public function fetch($protected_resource_url, $parameters = array(), $http_method = self::HTTP_METHOD_GET, array $http_headers = array(), $form_content_type = self::HTTP_FORM_CONTENT_TYPE_MULTIPART)
+    {
+        if ($this->access_token) {
+            switch ($this->access_token_type) {
+                case self::ACCESS_TOKEN_URI:
+                    if (is_array($parameters)) {
+                        $parameters[$this->access_token_param_name] = $this->access_token;
+                    } else {
+                        throw new InvalidArgumentException(
+                            'You need to give parameters as array if you want to give the token within the URI.',
+                            InvalidArgumentException::REQUIRE_PARAMS_AS_ARRAY
+                        );
+                    }
+                    break;
+                case self::ACCESS_TOKEN_BEARER:
+                    $http_headers['Authorization'] = 'Bearer ' . $this->access_token;
+                    break;
+                case self::ACCESS_TOKEN_OAUTH:
+                    $http_headers['Authorization'] = 'OAuth ' . $this->access_token;
+                    break;
+                case self::ACCESS_TOKEN_MAC:
+                    $http_headers['Authorization'] = 'MAC ' . $this->generateMACSignature($protected_resource_url, $parameters, $http_method);
+                    break;
+                default:
+                    throw new Exception('Unknown access token type.', Exception::INVALID_ACCESS_TOKEN_TYPE);
+                    break;
+            }
+        }
+        return $this->executeRequest($protected_resource_url, $parameters, $http_method, $http_headers, $form_content_type);
+    }
+
+    /**
+     * Generate the MAC signature
+     *
+     * @param string $url Called URL
+     * @param array  $parameters Parameters
+     * @param string $http_method Http Method
+     * @return string
+     */
+    private function generateMACSignature($url, $parameters, $http_method)
+    {
+        $timestamp = time();
+        $nonce = uniqid();
+        $parsed_url = parse_url($url);
+        if (!isset($parsed_url['port']))
+        {
+            $parsed_url['port'] = ($parsed_url['scheme'] == 'https') ? 443 : 80;
+        }
+        if ($http_method == self::HTTP_METHOD_GET) {
+            if (is_array($parameters)) {
+                $parsed_url['path'] .= '?' . http_build_query($parameters, '', '&');
+            } elseif ($parameters) {
+                $parsed_url['path'] .= '?' . $parameters;
+            }
+        }
+
+        $signature = base64_encode(hash_hmac($this->access_token_algorithm,
+                    $timestamp . "\n"
+                    . $nonce . "\n"
+                    . $http_method . "\n"
+                    . $parsed_url['path'] . "\n"
+                    . $parsed_url['host'] . "\n"
+                    . $parsed_url['port'] . "\n\n"
+                    , $this->access_token_secret, true));
+
+        return 'id="' . $this->access_token . '", ts="' . $timestamp . '", nonce="' . $nonce . '", mac="' . $signature . '"';
+    }
+
+    /**
+     * Execute a request (with curl)
+     *
+     * @param string $url URL
+     * @param mixed  $parameters Array of parameters
+     * @param string $http_method HTTP Method
+     * @param array  $http_headers HTTP Headers
+     * @param int    $form_content_type HTTP form content type to use
+     * @return array
+     */
+    private function executeRequest($url, $parameters = array(), $http_method = self::HTTP_METHOD_GET, array $http_headers = null, $form_content_type = self::HTTP_FORM_CONTENT_TYPE_MULTIPART)
+    {
+        $curl_options = array(
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_SSL_VERIFYPEER => true,
+            CURLOPT_CUSTOMREQUEST  => $http_method
+        );
+
+        switch($http_method) {
+            case self::HTTP_METHOD_POST:
+                $curl_options[CURLOPT_POST] = true;
+                /* No break */
+            case self::HTTP_METHOD_PUT:
+			case self::HTTP_METHOD_PATCH:
+
+                /**
+                 * Passing an array to CURLOPT_POSTFIELDS will encode the data as multipart/form-data,
+                 * while passing a URL-encoded string will encode the data as application/x-www-form-urlencoded.
+                 * http://php.net/manual/en/function.curl-setopt.php
+                 */
+                if(is_array($parameters) && self::HTTP_FORM_CONTENT_TYPE_APPLICATION === $form_content_type) {
+                    $parameters = http_build_query($parameters, '', '&');
+                }
+                $curl_options[CURLOPT_POSTFIELDS] = $parameters;
+                break;
+            case self::HTTP_METHOD_HEAD:
+                $curl_options[CURLOPT_NOBODY] = true;
+                /* No break */
+            case self::HTTP_METHOD_DELETE:
+            case self::HTTP_METHOD_GET:
+                if (is_array($parameters) && count($parameters) > 0) {
+                    $url .= '?' . http_build_query($parameters, '', '&');
+                } elseif ($parameters) {
+                    $url .= '?' . $parameters;
+                }
+                break;
+            default:
+                break;
+        }
+
+        $curl_options[CURLOPT_URL] = $url;
+
+        if (is_array($http_headers)) {
+            $header = array();
+            foreach($http_headers as $key => $parsed_urlvalue) {
+                $header[] = "$key: $parsed_urlvalue";
+            }
+            $curl_options[CURLOPT_HTTPHEADER] = $header;
+        }
+
+        $ch = curl_init();
+        curl_setopt_array($ch, $curl_options);
+        // https handling
+        if (!empty($this->certificate_file)) {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+            curl_setopt($ch, CURLOPT_CAINFO, $this->certificate_file);
+        } else {
+            // bypass ssl verification
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+        }
+        if (!empty($this->curl_options)) {
+            curl_setopt_array($ch, $this->curl_options);
+        }
+        $result = curl_exec($ch);
+        $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+        if ($curl_error = curl_error($ch)) {
+            throw new Exception($curl_error, Exception::CURL_ERROR);
+        } else {
+            $json_decode = json_decode($result, true);
+        }
+        curl_close($ch);
+
+        return array(
+            'result' => (null === $json_decode) ? $result : $json_decode,
+            'code' => $http_code,
+            'content_type' => $content_type
+        );
+    }
+
+    /**
+     * Set the name of the parameter that carry the access token
+     *
+     * @param string $name Token parameter name
+     * @return void
+     */
+    public function setAccessTokenParamName($name)
+    {
+        $this->access_token_param_name = $name;
+    }
+
+    /**
+     * Converts the class name to camel case
+     *
+     * @param  mixed  $grant_type  the grant type
+     * @return string
+     */
+    private function convertToCamelCase($grant_type)
+    {
+        $parts = explode('_', $grant_type);
+        array_walk($parts, function(&$item) { $item = ucfirst($item);});
+        return implode('', $parts);
+    }
+}
+
+class Exception extends \Exception
+{
+    const CURL_NOT_FOUND                     = 0x01;
+    const CURL_ERROR                         = 0x02;
+    const GRANT_TYPE_ERROR                   = 0x03;
+    const INVALID_CLIENT_AUTHENTICATION_TYPE = 0x04;
+    const INVALID_ACCESS_TOKEN_TYPE          = 0x05;
+}
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+    const INVALID_GRANT_TYPE      = 0x01;
+    const CERTIFICATE_NOT_FOUND   = 0x02;
+    const REQUIRE_PARAMS_AS_ARRAY = 0x03;
+    const MISSING_PARAMETER       = 0x04;
+}
diff --git a/plugins/login-oauth2/OAuth2/GrantType/AuthorizationCode.php b/plugins/login-oauth2/OAuth2/GrantType/AuthorizationCode.php
new file mode 100644
index 000000000..f3436e4c5
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/GrantType/AuthorizationCode.php
@@ -0,0 +1,41 @@
+<?php
+namespace OAuth2\GrantType;
+
+use OAuth2\InvalidArgumentException;
+
+/**
+ * Authorization code  Grant Type Validator
+ */
+class AuthorizationCode implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     *
+     * @var string  Defaults to 'authorization_code'.
+     */
+    const GRANT_TYPE = 'authorization_code';
+
+    /**
+     * Adds a specific Handling of the parameters
+     *
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+        if (!isset($parameters['code']))
+        {
+            throw new InvalidArgumentException(
+                'The \'code\' parameter must be defined for the Authorization Code grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+        elseif (!isset($parameters['redirect_uri']))
+        {
+            throw new InvalidArgumentException(
+                'The \'redirect_uri\' parameter must be defined for the Authorization Code grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+    }
+}
diff --git a/plugins/login-oauth2/OAuth2/GrantType/ClientCredentials.php b/plugins/login-oauth2/OAuth2/GrantType/ClientCredentials.php
new file mode 100644
index 000000000..c6c81f84b
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/GrantType/ClientCredentials.php
@@ -0,0 +1,25 @@
+<?php
+namespace OAuth2\GrantType;
+
+/**
+ * Client Credentials Parameters 
+ */
+class ClientCredentials implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     * 
+     * @var string  Defaults to 'client_credentials'. 
+     */
+    const GRANT_TYPE = 'client_credentials';
+
+    /**
+     * Adds a specific Handling of the parameters
+     * 
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+    }
+}
diff --git a/plugins/login-oauth2/OAuth2/GrantType/IGrantType.php b/plugins/login-oauth2/OAuth2/GrantType/IGrantType.php
new file mode 100644
index 000000000..60631922f
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/GrantType/IGrantType.php
@@ -0,0 +1,15 @@
+<?php
+namespace OAuth2\GrantType;
+/**
+ * Specific GrantType Interface
+ */
+interface IGrantType 
+{
+    /**
+     * Adds a specific Handling of the parameters
+     * 
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters);
+}
diff --git a/plugins/login-oauth2/OAuth2/GrantType/Password.php b/plugins/login-oauth2/OAuth2/GrantType/Password.php
new file mode 100644
index 000000000..8972409c9
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/GrantType/Password.php
@@ -0,0 +1,41 @@
+<?php
+namespace OAuth2\GrantType;
+
+use OAuth2\InvalidArgumentException;
+
+/**
+ * Password Parameters
+ */
+class Password implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     *
+     * @var string  Defaults to 'password'.
+     */
+    const GRANT_TYPE = 'password';
+
+    /**
+     * Adds a specific Handling of the parameters
+     *
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+        if (!isset($parameters['username']))
+        {
+            throw new InvalidArgumentException(
+                'The \'username\' parameter must be defined for the Password grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+        elseif (!isset($parameters['password']))
+        {
+            throw new InvalidArgumentException(
+                'The \'password\' parameter must be defined for the Password grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+    }
+}
diff --git a/plugins/login-oauth2/OAuth2/GrantType/RefreshToken.php b/plugins/login-oauth2/OAuth2/GrantType/RefreshToken.php
new file mode 100644
index 000000000..12fccb04e
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/GrantType/RefreshToken.php
@@ -0,0 +1,34 @@
+<?php
+namespace OAuth2\GrantType;
+
+use OAuth2\InvalidArgumentException;
+
+/**
+ * Refresh Token  Parameters
+ */
+class RefreshToken implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     *
+     * @var string  Defaults to 'refresh_token'.
+     */
+    const GRANT_TYPE = 'refresh_token';
+
+    /**
+     * Adds a specific Handling of the parameters
+     *
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+        if (!isset($parameters['refresh_token']))
+        {
+            throw new InvalidArgumentException(
+                'The \'refresh_token\' parameter must be defined for the refresh token grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+    }
+}
diff --git a/plugins/login-oauth2/OAuth2/LICENSE b/plugins/login-oauth2/OAuth2/LICENSE
new file mode 100644
index 000000000..8000a6faa
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/LICENSE
@@ -0,0 +1,504 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+    USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random
+  Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/plugins/login-oauth2/OAuth2/README.md b/plugins/login-oauth2/OAuth2/README.md
new file mode 100644
index 000000000..9de3570e0
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/README.md
@@ -0,0 +1,105 @@
+# Light PHP wrapper for the OAuth 2.0
+
+[![Latest Stable Version](https://poser.pugx.org/adoy/fastcgi-client/v/stable)](https://packagist.org/packages/adoy/fastcgi-client)
+[![GitHub](https://img.shields.io/github/license/adoy/PHP-OAuth2)](LICENSE)
+[![Total Downloads](https://poser.pugx.org/adoy/fastcgi-client/downloads)](https://packagist.org/packages/adoy/fastcgi-client)
+
+
+## How can I use it ?
+
+```php
+<?php
+
+require('Client.php');
+require('GrantType/IGrantType.php');
+require('GrantType/AuthorizationCode.php');
+
+const CLIENT_ID     = 'your client id';
+const CLIENT_SECRET = 'your client secret';
+
+const REDIRECT_URI           = 'http://url/of/this.php';
+const AUTHORIZATION_ENDPOINT = 'https://graph.facebook.com/oauth/authorize';
+const TOKEN_ENDPOINT         = 'https://graph.facebook.com/oauth/access_token';
+
+$client = new OAuth2\Client(CLIENT_ID, CLIENT_SECRET);
+if (!isset($_GET['code']))
+{
+    $auth_url = $client->getAuthenticationUrl(AUTHORIZATION_ENDPOINT, REDIRECT_URI);
+    header('Location: ' . $auth_url);
+    die('Redirect');
+}
+else
+{
+    $params = array('code' => $_GET['code'], 'redirect_uri' => REDIRECT_URI);
+    $response = $client->getAccessToken(TOKEN_ENDPOINT, 'authorization_code', $params);
+    parse_str($response['result'], $info);
+    $client->setAccessToken($info['access_token']);
+    $response = $client->fetch('https://graph.facebook.com/me');
+    var_dump($response, $response['result']);
+}
+```
+
+## How can I add a new Grant Type ?
+
+Simply write a new class in the namespace OAuth2\GrantType. You can place the class file under GrantType.
+Here is an example :
+
+```php
+<?php
+
+namespace OAuth2\GrantType;
+
+/**
+ * MyCustomGrantType Grant Type
+ */
+class MyCustomGrantType implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     *
+     * @var string  Defaults to 'my_custom_grant_type'.
+     */
+    const GRANT_TYPE = 'my_custom_grant_type';
+
+    /**
+     * Adds a specific Handling of the parameters
+     *
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+        if (!isset($parameters['first_mandatory_parameter']))
+        {
+            throw new \Exception('The \'first_mandatory_parameter\' parameter must be defined for the Password grant type');
+        }
+        elseif (!isset($parameters['second_mandatory_parameter']))
+        {
+            throw new \Exception('The \'seconde_mandatory_parameter\' parameter must be defined for the Password grant type');
+        }
+    }
+}
+```
+
+call the OAuth client getAccessToken with the grantType you defined in the GRANT_TYPE constant, As following :
+
+```
+$response = $client->getAccessToken(TOKEN_ENDPOINT, 'my_custom_grant_type', $params);
+```
+
+## LICENSE
+
+This Code is released under the GNU LGPL
+
+Please do not change the header of the file(s).
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published
+by the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This library is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU Lesser General Public License for more details.
diff --git a/plugins/login-oauth2/index.php b/plugins/login-oauth2/index.php
index cb92e1f24..1e83dd328 100644
--- a/plugins/login-oauth2/index.php
+++ b/plugins/login-oauth2/index.php
@@ -4,9 +4,9 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'OAuth2',
-		VERSION  = '1.0',
-		RELEASE  = '2021-11-12',
-		REQUIRED = '2.9.1',
+		VERSION  = '1.1',
+		RELEASE  = '2022-11-11',
+		REQUIRED = '2.21.0',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'IMAP, Sieve & SMTP login using RFC 7628 OAuth2';
 
@@ -19,19 +19,26 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 	{
 		$this->UseLangs(true);
 		$this->addJs('LoginOAuth2.js');
-//		$this->addHook('imap.before-connect', array($this, $oImapClient, &$aCredentials));
-//		$this->addHook('imap.after-connect', array($this, $oImapClient, $aCredentials));
+//		$this->addHook('imap.before-connect', array($this, $oImapClient, $oSettings));
+//		$this->addHook('imap.after-connect', array($this, $oImapClient, $oSettings));
 		$this->addHook('imap.before-login', 'clientLogin');
-//		$this->addHook('imap.after-login', array($this, $oImapClient, $aCredentials));
-//		$this->addHook('smtp.before-connect', array($this, $oSmtpClient, &$aCredentials));
-//		$this->addHook('smtp.after-connect', array($this, $oSmtpClient, $aCredentials));
+//		$this->addHook('imap.after-login', array($this, $oImapClient, $oSettings));
+//		$this->addHook('smtp.before-connect', array($this, $oSmtpClient, $oSettings));
+//		$this->addHook('smtp.after-connect', array($this, $oSmtpClient, $oSettings));
 		$this->addHook('smtp.before-login', 'clientLogin');
-//		$this->addHook('smtp.after-login', array($this, $oSmtpClient, $aCredentials));
-//		$this->addHook('sieve.before-connect', array($this, $oSieveClient, &$aCredentials));
-//		$this->addHook('sieve.after-connect', array($this, $oSieveClient, $aCredentials));
+//		$this->addHook('smtp.after-login', array($this, $oSmtpClient, $oSettings));
+//		$this->addHook('sieve.before-connect', array($this, $oSieveClient, $oSettings));
+//		$this->addHook('sieve.after-connect', array($this, $oSieveClient, $oSettings));
 		$this->addHook('sieve.before-login', 'clientLogin');
-//		$this->addHook('sieve.after-login', array($this, $oSieveClient, $aCredentials));
+//		$this->addHook('sieve.after-login', array($this, $oSieveClient, $oSettings));
 		$this->addHook('filter.account', 'filterAccount');
+
+//		set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__);
+		spl_autoload_register(function($classname){
+			if (str_starts_with($classname, 'OAuth2\\')) {
+				include_once __DIR__ . strtr("\\{$sClassName}", '\\', DIRECTORY_SEPARATOR) . '.php';
+			}
+		});
 	}
 
 	public function configMapping() : array
@@ -46,9 +53,9 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 		];
 	}
 
-	public function clientLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, array &$aCredentials) : void
+	public function clientLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, \MailSo\Net\ConnectSettings $oSettings) : void
 	{
-		$sPassword = $aCredentials['Password'];
+		$sPassword = $oSettings->Password;
 		$iGatLen = \strlen(static::GMAIL_TOKENS_PREFIX);
 		if ($sPassword && static::GMAIL_TOKENS_PREFIX === \substr($sPassword, 0, $iGatLen)) {
 			$aTokens = \json_decode(\substr($sPassword, $iGatLen));
@@ -56,8 +63,8 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 			$sRefreshToken = !empty($aTokens[1]) ? $aTokens[1] : '';
 		}
 		if ($sAccessToken && $sRefreshToken) {
-			$aCredentials['Password'] = $this->gmailRefreshToken($sAccessToken, $sRefreshToken);
-			\array_unshift($aCredentials['SASLMechanisms'], 'OAUTHBEARER', 'XOAUTH2');
+			$oSettings->Password = $this->gmailRefreshToken($sAccessToken, $sRefreshToken);
+			\array_unshift($oSettings->SASLMechanisms, 'OAUTHBEARER', 'XOAUTH2');
 		}
 	}
 
@@ -175,10 +182,10 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 		$client_id = \trim($this->Config()->Get('plugin', 'client_id', ''));
 		$client_secret = \trim($this->Config()->Get('plugin', 'client_secret', ''));
 		if ($client_id && $client_secret) {
-			include_once APP_VERSION_ROOT_PATH.'app/libraries/PHP-OAuth2/Client.php';
-			include_once APP_VERSION_ROOT_PATH.'app/libraries/PHP-OAuth2/GrantType/IGrantType.php';
-			include_once APP_VERSION_ROOT_PATH.'app/libraries/PHP-OAuth2/GrantType/AuthorizationCode.php';
-			include_once APP_VERSION_ROOT_PATH.'app/libraries/PHP-OAuth2/GrantType/RefreshToken.php';
+//			include_once __DIR__ . '/OAuth2/Client.php';
+//			include_once __DIR__ . '/OAuth2/GrantType/IGrantType.php';
+//			include_once __DIR__ . '/OAuth2/GrantType/AuthorizationCode.php';
+//			include_once __DIR__ . '/OAuth2/GrantType/RefreshToken.php';
 
 			try
 			{
diff --git a/plugins/login-remote/LICENSE b/plugins/login-remote/LICENSE
new file mode 100644
index 000000000..f709b02e2
--- /dev/null
+++ b/plugins/login-remote/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/login-remote/index.php b/plugins/login-remote/index.php
new file mode 100644
index 000000000..6c7a2596d
--- /dev/null
+++ b/plugins/login-remote/index.php
@@ -0,0 +1,79 @@
+<?php
+
+class LoginRemotePlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Login Remote',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '1.1',
+		RELEASE  = '2022-11-24',
+		REQUIRED = '2.21.0',
+		CATEGORY = 'Login',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Tries to login using the $_ENV["REMOTE_*"] variables';
+
+	public function Init() : void
+	{
+		$this->addPartHook('RemoteAutoLogin', 'ServiceRemoteAutoLogin');
+		$this->addHook('filter.app-data', 'FilterAppData');
+		$this->addHook('login.credentials', 'FilterLoginCredentials');
+	}
+
+	public function FilterAppData($bAdmin, &$aResult)
+	{
+		if (!$bAdmin && \is_array($aResult) && empty($aResult['Auth']) && isset($_ENV['REMOTE_USER'])) {
+			$aResult['DevEmail'] = $_ENV['REMOTE_USER'];
+//			$aResult['DevPassword'] = $_ENV['REMOTE_PASSWORD'];
+		}
+	}
+
+	private static bool $login = false;
+	public function ServiceRemoteAutoLogin() : bool
+	{
+		$oActions = \RainLoop\Api::Actions();
+
+		$oException = null;
+		$oAccount = null;
+
+		$sEmail = $_ENV['REMOTE_USER'] ?? '';
+		$sPassword = $_ENV['REMOTE_PASSWORD'] ?? '';
+
+		if (\strlen($sEmail) && \strlen($sPassword)) {
+			try
+			{
+				static::$login = true;
+				$oAccount = $oActions->LoginProcess($sEmail, $sPassword);
+				if ($oAccount instanceof \RainLoop\Model\MainAccount) {
+					$oActions->SetAuthToken($oAccount);
+				}
+			}
+			catch (\Throwable $oException)
+			{
+				$oLogger = $oActions->Logger();
+				$oLogger && $oLogger->WriteException($oException);
+			}
+		}
+
+		$oActions->Location('./');
+		return true;
+	}
+
+	public function FilterLoginCredentials(&$sEmail, &$sLogin, &$sPassword)
+	{
+		// cPanel https://github.com/the-djmaze/snappymail/issues/697
+//		 && !empty($_ENV['CPANEL'])
+		if (static::$login/* && $sLogin == $_ENV['REMOTE_USER']*/) {
+			if (empty($_ENV['REMOTE_TEMP_USER'])) {
+				$iPos = \strpos($sPassword, '[::cpses::]');
+				if ($iPos) {
+					$_ENV['REMOTE_TEMP_USER'] = \substr($sPassword, 0, $iPos);
+				}
+			}
+			if (!empty($_ENV['REMOTE_TEMP_USER'])) {
+				$sLogin = $_ENV['REMOTE_USER'] . '/' . $_ENV['REMOTE_TEMP_USER'];
+			}
+		}
+	}
+
+}
diff --git a/plugins/nextcloud/index.php b/plugins/nextcloud/index.php
index e6c45565f..2c541439d 100644
--- a/plugins/nextcloud/index.php
+++ b/plugins/nextcloud/index.php
@@ -4,8 +4,8 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Nextcloud',
-		VERSION = '2.10',
-		RELEASE  = '2022-11-04',
+		VERSION = '2.11',
+		RELEASE  = '2022-11-14',
 		CATEGORY = 'Integrations',
 		DESCRIPTION = 'Integrate with Nextcloud v20+',
 		REQUIRED = '2.19.0';
diff --git a/plugins/nextcloud/js/composer.js b/plugins/nextcloud/js/composer.js
index b53611dc2..7ee5f015d 100644
--- a/plugins/nextcloud/js/composer.js
+++ b/plugins/nextcloud/js/composer.js
@@ -29,6 +29,7 @@
 								}
 							);
 						} else if (file.url) {
+							// TODO: other editors and text/plain
 							view.oEditor.editor.squire.makeLink(file.url);
 						}
 					});
diff --git a/plugins/nextcloud/js/message.js b/plugins/nextcloud/js/message.js
index cbb4a4ed1..37f2956df 100644
--- a/plugins/nextcloud/js/message.js
+++ b/plugins/nextcloud/js/message.js
@@ -1,8 +1,54 @@
 (rl => {
 //	if (rl.settings.get('Nextcloud'))
+	const templateId = 'MailMessageView';
 
 	addEventListener('rl-view-model.create', e => {
-		if ('MailMessageView' === e.detail.viewModelTemplateID) {
+		if (templateId === e.detail.viewModelTemplateID) {
+
+			const
+				template = document.getElementById(templateId),
+				cfg = rl.settings.get('Nextcloud'),
+				attachmentsControls = template.content.querySelector('.attachmentsControls'),
+				msgMenu = template.content.querySelector('#more-view-dropdown-id + menu');
+
+			if (attachmentsControls) {
+				attachmentsControls.append(Element.fromHTML(`<span>
+					<i class="fontastic iconcolor-red" data-bind="visible: saveNextcloudError">✖</i>
+					<i class="fontastic" data-bind="visible: !saveNextcloudError(),
+						css: {'icon-spinner': saveNextcloudLoading()}">💾</i>
+					<span class="g-ui-link" data-bind="click: saveNextcloud" data-i18n="NEXTCLOUD/SAVE_ATTACHMENTS"></span>
+				</span>`));
+
+				// https://github.com/nextcloud/calendar/issues/4684
+				if (cfg.CalDAV) {
+					attachmentsControls.append(Element.fromHTML(`<span data-bind="visible: nextcloudICS" data-icon="📅">
+						<span class="g-ui-link" data-bind="click: nextcloudSaveICS" data-i18n="NEXTCLOUD/SAVE_ICS"></span>
+					</span>`));
+				}
+			}
+/*
+			// https://github.com/the-djmaze/snappymail/issues/592
+			if (cfg.CalDAV) {
+				const attachmentsPlace = template.content.querySelector('.attachmentsPlace');
+				attachmentsPlace.after(Element.fromHTML(`
+				<table data-bind="if: nextcloudICS, visible: nextcloudICS"><tbody style="white-space:pre">
+					<tr><td>Summary</td><td data-icon="📅" data-bind="text: nextcloudICS().SUMMARY"></td></tr>
+					<tr><td>Organizer</td><td data-bind="text: nextcloudICS().ORGANIZER"></td></tr>
+					<tr><td>Start</td><td data-bind="text: nextcloudICS().DTSTART"></td></tr>
+					<tr><td>End</td><td data-bind="text: nextcloudICS().DTEND"></td></tr>
+					<tr><td>Transparency</td><td data-bind="text: nextcloudICS().TRANSP"></td></tr>
+					<tr data-bind="foreach: nextcloudICS().ATTENDEE">
+						<td></td><td data-bind="text: $data.replace(/;/g,';\\n')"></td>
+					</tr>
+				</tbody></table>`));
+			}
+*/
+			if (msgMenu) {
+				msgMenu.append(Element.fromHTML(`<li role="presentation">
+					<a href="#" tabindex="-1" data-icon="📥" data-bind="click: nextcloudSaveMsg" data-i18n="NEXTCLOUD/SAVE_EML"></a>
+				</li>`));
+			}
+
 			let view = e.detail;
 			view.saveNextcloudError = ko.observable(false).extend({ falseTimeout: 7000 });
 			view.saveNextcloudLoading = ko.observable(false);
@@ -65,7 +111,7 @@
 			view.nextcloudSaveICS = () => {
 				let VEVENT = view.nextcloudICS();
 				VEVENT && rl.nextcloud.selectCalendar()
-				.then(href => href && rl.nextcloud.calendarPut(href, VEVENT.rawText));
+				.then(href => href && rl.nextcloud.calendarPut(href, VEVENT));
 			}
 
 			/**
@@ -73,7 +119,7 @@
 			 */
 			view.message.subscribe(msg => {
 				view.nextcloudICS(null);
-				if (msg) {
+				if (msg && cfg.CalDAV) {
 					let ics = msg.attachments.find(attachment => 'text/calendar' == attachment.mimeType);
 					if (ics && ics.download) {
 						// fetch it and parse the VEVENT
@@ -119,7 +165,7 @@
 								}
 							}
 //							METHOD:REPLY || METHOD:REQUEST
-							console.dir({VEVENT:VEVENT});
+//							console.dir({VEVENT:VEVENT});
 							if (VEVENT) {
 								VEVENT.rawText = text;
 								VEVENT.isCancelled = () => VEVENT.STATUS?.includes('CANCELLED');
@@ -138,47 +184,4 @@
 		}
 	});
 
-	let template = document.getElementById('MailMessageView');
-	let cfg = rl.settings.get('Nextcloud');
-
-	const attachmentsControls = template.content.querySelector('.attachmentsControls');
-	if (attachmentsControls) {
-		attachmentsControls.append(Element.fromHTML(`<span>
-			<i class="fontastic iconcolor-red" data-bind="visible: saveNextcloudError">✖</i>
-			<i class="fontastic" data-bind="visible: !saveNextcloudError(),
-				css: {'icon-spinner': saveNextcloudLoading()}">💾</i>
-			<span class="g-ui-link" data-bind="click: saveNextcloud" data-i18n="NEXTCLOUD/SAVE_ATTACHMENTS"></span>
-		</span>`));
-
-		// https://github.com/nextcloud/calendar/issues/4684
-		if (cfg.CalDAV) {
-			attachmentsControls.append(Element.fromHTML(`<span data-bind="visible: nextcloudICS" data-icon="📅">
-				<span class="g-ui-link" data-bind="click: nextcloudSaveICS" data-i18n="NEXTCLOUD/SAVE_ICS"></span>
-			</span>`));
-		}
-	}
-/*
-	// https://github.com/the-djmaze/snappymail/issues/592
-	if (cfg.CalDAV) {
-		const attachmentsPlace = template.content.querySelector('.attachmentsPlace');
-		attachmentsPlace.after(Element.fromHTML(`
-		<table data-bind="if: nextcloudICS, visible: nextcloudICS"><tbody style="white-space:pre">
-			<tr><td>Summary</td><td data-icon="📅" data-bind="text: nextcloudICS().SUMMARY"></td></tr>
-			<tr><td>Organizer</td><td data-bind="text: nextcloudICS().ORGANIZER"></td></tr>
-			<tr><td>Start</td><td data-bind="text: nextcloudICS().DTSTART"></td></tr>
-			<tr><td>End</td><td data-bind="text: nextcloudICS().DTEND"></td></tr>
-			<tr><td>Transparency</td><td data-bind="text: nextcloudICS().TRANSP"></td></tr>
-			<tr data-bind="foreach: nextcloudICS().ATTENDEE">
-				<td></td><td data-bind="text: $data.replace(/;/g,';\\n')"></td>
-			</tr>
-		</tbody></table>`));
-	}
-*/
-	const msgMenu = template.content.querySelector('#more-view-dropdown-id + menu');
-	if (msgMenu) {
-		msgMenu.append(Element.fromHTML(`<li role="presentation">
-			<a href="#" tabindex="-1" data-icon="📥" data-bind="click: nextcloudSaveMsg" data-i18n="NEXTCLOUD/SAVE_EML"></a>
-		</li>`));
-	}
-
 })(window.rl);
diff --git a/plugins/nextcloud/js/messagelist.js b/plugins/nextcloud/js/messagelist.js
index 13feda12d..5b5d27b43 100644
--- a/plugins/nextcloud/js/messagelist.js
+++ b/plugins/nextcloud/js/messagelist.js
@@ -6,7 +6,7 @@
 			let view = e.detail;
 			view.nextcloudSaveMsgs = () => {
 				view.messageList.hasChecked()
-				 && rl.ncFiles.selectFolder().then(folder => {
+				 && rl.nextcloud.selectFolder().then(folder => {
 					folder && view.messageList.forEach(msg => {
 						msg.checked() && rl.pluginRemoteRequest(
 							(iError, data) => {
diff --git a/plugins/nextcloud/js/webdav.js b/plugins/nextcloud/js/webdav.js
index 824926b7b..9915dd2b8 100644
--- a/plugins/nextcloud/js/webdav.js
+++ b/plugins/nextcloud/js/webdav.js
@@ -10,6 +10,7 @@ const
 	OC = () => parent.OC,
 
 	// Nextcloud 19 deprecated generateUrl, but screw `import { generateUrl } from "@nextcloud/router"`
+	shareUrl = () => OC().webroot + '/ocs/v2.php/apps/files_sharing/api/v1/shares',
 	generateUrl = path => OC().webroot + (OC().config.modRewriteWorking ? '' : '/index.php') + path,
 	generateRemoteUrl = path => location.protocol + '//' + location.host + generateUrl(path),
 
@@ -22,36 +23,10 @@ const
 		<oc:size/>
 		<resourcetype/>
 		<getcontentlength/>
-
-		<getcontenttype/>
-		<oc:permissions/>
 		<ocs:share-permissions/>
-		<nc:share-attributes/>
 		<oc:share-types/>
-		<nc:is-encrypted/>
 	</prop>
 </propfind>`,
-/*
-<d:propstat>
-	<d:prop>
-		<d:getcontenttype>video/mp4</d:getcontenttype>
-		<oc:permissions>RGDNVW</oc:permissions>
-		<d:getcontentlength>3963036</d:getcontentlength>
-		<ocs:share-permissions>19</ocs:share-permissions>
-		<nc:share-attributes>[]</nc:share-attributes>
-		<oc:share-types>
-			<oc:share-type>3</oc:share-type>
-		</oc:share-types>
-	</d:prop>
-	<d:status>HTTP/1.1 200 OK</d:status>
-</d:propstat>
-<d:propstat>
-	<d:prop>
-		<nc:is-encrypted/>
-	</d:prop>
-	<d:status>HTTP/1.1 404 Not Found</d:status>
-</d:propstat>
-*/
 
 	propfindCal = `<?xml version="1.0"?>
 <propfind xmlns="DAV:">
@@ -70,11 +45,10 @@ const
 	getDavElementByTagName = (parent, localName) => getDavElementsByTagName(parent, localName)?.item(0),
 	getElementByTagName = (parent, localName) => +parent.getElementsByTagName(localName)?.item(0),
 
-	davFetch = (mode, path, options) => {
+	ncFetch = (path, options) => {
 		if (!OC().requestToken) {
 			return Promise.reject(new Error('OC.requestToken missing'));
 		}
-		let cfg = rl.settings.get('Nextcloud');
 		options = Object.assign({
 			mode: 'same-origin',
 			cache: 'no-cache',
@@ -83,8 +57,13 @@ const
 			headers: {}
 		}, options);
 		options.headers.requesttoken = OC().requestToken;
+		return fetch(path, options);
+	},
+
+	davFetch = (mode, path, options) => {
+		let cfg = rl.settings.get('Nextcloud');
 //		cfg.UID = document.head.dataset.user
-		return fetch(cfg.WebDAV + '/' + mode + '/' + cfg.UID + path, options);
+		return ncFetch(cfg.WebDAV + '/' + mode + '/' + cfg.UID + path, options);
 	},
 
 	davFetchFiles = (path, options) => davFetch('files', path, options),
@@ -129,6 +108,7 @@ const
 					elem.id = e.getElementsByTagNameNS(nsOC, 'fileid')?.item(0)?.textContent;
 					elem.size = getDavElementByTagName(e, 'getcontentlength')?.textContent
 						|| getElementByTagName(e, 'oc:size')?.textContent;
+					elem.shared = [...e.getElementsByTagNameNS(nsOC, 'share-type')].some(node => '3' == node.textContent);
 				}
 				elemList.push(elem);
 			}
@@ -176,22 +156,25 @@ const
 						li.dataset.icon = '🗎';
 
 						btn.name = 'select';
-						btn.textContent = 'select';
+						btn.dataset.icon = '📎';
+						btn.textContent = 'attach';
 						btn.className = 'button-vue';
 						li.append(btn);
 
 						btn = document.createElement('button');
 						btn.name = 'share-internal';
-						btn.textContent = '🔗 internal';
+						btn.dataset.icon = '🔗';
+						btn.textContent = 'internal';
 						btn.className = 'button-vue';
 						li.append(btn);
-/*
+
 						btn = document.createElement('button');
 						btn.name = 'share-public';
-						btn.textContent = '🔗 public';
+						btn.dataset.icon = '🔗';
+						btn.textContent = 'public';
 						btn.className = 'button-vue';
 						li.append(btn);
-*/
+
 						parent.append(li);
 					}
 				});
@@ -225,46 +208,48 @@ class NextcloudFilesPopupView extends rl.pluginPopupView {
 		this.tree.addEventListener('click', event => {
 			let el = event.target;
 			if (el.matches('button')) {
-				let parent = el.parentNode;
+				let parent = el.parentNode,
+					item = parent.item;
 				if ('select' == el.name) {
-					this.select = this.files() ? [parent.item] : parent.item_name;
+					this.select = this.files() ? [item] : parent.item_name;
 					this.close();
 				} else if ('share-internal' == el.name) {
-					this.select = [{url:generateRemoteUrl(`/f/${parent.item.id}`)}];
+					this.select = [{url:generateRemoteUrl(`/f/${item.id}`)}];
 					this.close();
 				} else if ('share-public' == el.name) {
-/*
-					if (3 == share-type) {
-						GET generateUrl(`/ocs/v2.php/apps/files_sharing/api/v1/shares?format=json&path=${encodeURIComponent(parent.item.name)}&reshares=true`);
+					if (item.shared) {
+						ncFetch(
+							shareUrl() + `?format=json&path=${encodeURIComponent(item.name)}&reshares=true`
+						)
+						.then(response => (response.status < 400) ? response.json() : Promise.reject(new Error({ response })))
+						.then(json => {
+							this.select = [{url:json.ocs.data[0].url}];
+							this.close();
+//							json.data[0].password
+						});
 					} else {
-						POST generateUrl(`/ocs/v2.php/apps/files_sharing/api/v1/shares`)
-						> {"path":"/Nextcloud intro.mp4","shareType":3,"attributes":"[]"}
-						< {"ocs":{"meta":{"status":"ok","statuscode":200,"message":"OK"},
-							"data":{
-								"id":"2",
-								"share_type":3,
-								"permissions":17,
-								"token":"7GK9mL9LCTseSgK",
-								"path":"\/Nextcloud intro.mp4",
-								"item_type":"file",
-								"mimetype":"video\/mp4",
-								"storage":1,
-								"item_source":20,
-								"file_source":20,
-								"file_parent":2,
-								"file_target":"\/Nextcloud intro.mp4",
-								"password":null,
-								"url":"https:\/\/example.com\/index.php\/s\/7GK9mL9LCTseSgK",
-								"mail_send":1,
-								"hide_download":0,
-								"attributes":null
-							}}}
-						GET /index.php/s/7GK9mL9LCTseSgK
-						PUT /ocs/v2.php/apps/files_sharing/api/v1/shares/2
-						> {"expireDate":"\"2022-11-29T23:00:00.000Z\""}
-						> {"password":"ABC09"}
+						ncFetch(
+							shareUrl(),
+							{
+								method:'POST',
+								headers: {
+									Accept: 'application/json',
+									'Content-Type': 'application/json'
+								},
+								body: JSON.stringify({
+									path:item.name,
+									shareType:3,
+									attributes:"[]"
+								})
+							}
+						)
+						.then(response => (response.status < 400) ? response.json() : Promise.reject(new Error({ response })))
+						.then(json => {
+//							PUT /ocs/v2.php/apps/files_sharing/api/v1/shares/2 {"password":"ABC09"}
+							this.select = [{url:json.ocs.data.url}];
+							this.close();
+						});
 					}
-*/
 				} else if ('create' == el.name) {
 					let name = el.input.value.replace(/[|\\?*<":>+[]\/&\s]/g, '');
 					if (name.length) {
@@ -384,20 +369,29 @@ rl.nextcloud = {
 		}),
 
 	calendarPut: (path, event) => {
-		// Validation error in iCalendar: A calendar object on a CalDAV server MUST NOT have a METHOD property.
-		event = event.replace(/METHOD:.+\r?\n/i, '');
-
-		let m = event.match(/UID:(.+)/);
-		davFetch('calendars', path + '/' + m[1] + '.ics', {
+		davFetch('calendars', path + '/' + event.UID + '.ics', {
 			method: 'PUT',
 			headers: {
 				'Content-Type': 'text/calendar'
 			},
-			body: event
+			// Validation error in iCalendar: A calendar object on a CalDAV server MUST NOT have a METHOD property.
+			body: event.rawText
+				.replace('METHOD:', 'X-METHOD:')
+				// https://github.com/nextcloud/calendar/issues/4684
+				.replace('ATTENDEE:', 'X-ATTENDEE:')
+				.replace('ORGANIZER:', 'X-ORGANIZER:')
+				.replace(/RSVP=TRUE/g, 'RSVP=FALSE')
+				.replace(/\r?\n/g, '\r\n')
 		})
-		.then(response => (response.status < 400) ? response.text() : Promise.reject(new Error({ response })))
-		.then(text => {
-			console.dir({event_response:text});
+		.then(response => {
+			if (201 == response.status) {
+				// Created
+			} else if (204 == response.status) {
+				// Not modified
+			} else {
+//				response.text().then(text => console.error({status:response.status, body:text}));
+				Promise.reject(new Error({ response }));
+			}
 		});
 	},
 
diff --git a/plugins/nextcloud/style.css b/plugins/nextcloud/style.css
index aab6db5f7..e99ac0767 100644
--- a/plugins/nextcloud/style.css
+++ b/plugins/nextcloud/style.css
@@ -3,6 +3,7 @@
 }
 #V-PopupsNextcloudFiles li {
 	clear: right;
+	line-height: 2.5em;
 }
 #V-PopupsNextcloudFiles li button {
 	cursor: pointer;
diff --git a/plugins/override-smtp-credentials/index.php b/plugins/override-smtp-credentials/index.php
index 893d7a513..edd278364 100644
--- a/plugins/override-smtp-credentials/index.php
+++ b/plugins/override-smtp-credentials/index.php
@@ -4,9 +4,9 @@ class OverrideSmtpCredentialsPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Override SMTP Credentials',
-		VERSION = '2.2',
-		RELEASE = '2022-04-13',
-		REQUIRED = '2.5.0',
+		VERSION = '2.3',
+		RELEASE = '2022-11-11',
+		REQUIRED = '2.21.0',
 		CATEGORY = 'Filters',
 		DESCRIPTION = 'Override SMTP credentials for specific users.';
 
@@ -19,46 +19,43 @@ class OverrideSmtpCredentialsPlugin extends \RainLoop\Plugins\AbstractPlugin
 	/**
 	 * @param \RainLoop\Model\Account $oAccount
 	 * @param \MailSo\Smtp\SmtpClient $oSmtpClient
-	 * @param array $aSmtpCredentials
+	 * @param \MailSo\Smtp\Settings $oSettings
 	 */
-	public function FilterSmtpCredentials($oAccount, $oSmtpClient, &$aSmtpCredentials)
+	public function FilterSmtpCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Smtp\SmtpClient $oSmtpClient, \MailSo\Smtp\Settings $oSettings)
 	{
-		if ($oAccount instanceof \RainLoop\Model\Account && \is_array($aSmtpCredentials))
+		$sEmail = $oAccount->Email();
+
+		$sHost = \trim($this->Config()->Get('plugin', 'smtp_host', ''));
+		$sWhiteList = \trim($this->Config()->Get('plugin', 'override_users', ''));
+
+		$sFoundValue = '';
+		if (0 < strlen($sWhiteList) && 0 < \strlen($sHost) && \RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sWhiteList, $sFoundValue))
 		{
-			$sEmail = $oAccount->Email();
+			\SnappyMail\LOG::debug('SMTP Override', "{$sEmail} matched {$sFoundValue}");
+			$oSettings->host = $sHost;
+			$oSettings->port = (int) $this->Config()->Get('plugin', 'smtp_port', 25);
 
-			$sHost = \trim($this->Config()->Get('plugin', 'smtp_host', ''));
-			$sWhiteList = \trim($this->Config()->Get('plugin', 'override_users', ''));
-
-			$sFoundValue = '';
-			if (0 < strlen($sWhiteList) && 0 < \strlen($sHost) && \RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sWhiteList, $sFoundValue))
+			$sSecure = \trim($this->Config()->Get('plugin', 'smtp_secure', 'None'));
+			switch ($sSecure)
 			{
-				\SnappyMail\LOG::debug('SMTP Override', "{$sEmail} matched {$sFoundValue}");
-				$aSmtpCredentials['Host'] = $sHost;
-				$aSmtpCredentials['Port'] = (int) $this->Config()->Get('plugin', 'smtp_port', 25);
-
-				$sSecure = \trim($this->Config()->Get('plugin', 'smtp_secure', 'None'));
-				switch ($sSecure)
-				{
-					case 'SSL':
-						$aSmtpCredentials['Secure'] = MailSo\Net\Enumerations\ConnectionSecurityType::SSL;
-						break;
-					case 'TLS':
-						$aSmtpCredentials['Secure'] = MailSo\Net\Enumerations\ConnectionSecurityType::STARTTLS;
-						break;
-					default:
-						$aSmtpCredentials['Secure'] = MailSo\Net\Enumerations\ConnectionSecurityType::NONE;
-						break;
-				}
-
-				$aSmtpCredentials['UseAuth'] = (bool) $this->Config()->Get('plugin', 'smtp_auth', true);
-				$aSmtpCredentials['Login'] = \trim($this->Config()->Get('plugin', 'smtp_user', ''));
-				$aSmtpCredentials['Password'] = (string) $this->Config()->Get('plugin', 'smtp_password', '');
-			}
-			else
-			{
-				\SnappyMail\LOG::debug('SMTP Override', "{$sEmail} no match");
+				case 'SSL':
+					$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::SSL;
+					break;
+				case 'TLS':
+					$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::STARTTLS;
+					break;
+				default:
+					$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::NONE;
+					break;
 			}
+
+			$oSettings->useAuth = (bool) $this->Config()->Get('plugin', 'smtp_auth', true);
+			$oSettings->Login = \trim($this->Config()->Get('plugin', 'smtp_user', ''));
+			$oSettings->Password = (string) $this->Config()->Get('plugin', 'smtp_password', '');
+		}
+		else
+		{
+			\SnappyMail\LOG::debug('SMTP Override', "{$sEmail} no match");
 		}
 	}
 
diff --git a/release.php b/release.php
index a784a62ea..51303e743 100755
--- a/release.php
+++ b/release.php
@@ -2,7 +2,7 @@
 <?php
 chdir(__DIR__);
 
-$options = getopt('', ['aur','docker','plugins','set-version','skip-gulp','debian','nextcloud','sign']);
+$options = getopt('', ['aur','docker','plugins','set-version','skip-gulp','debian','nextcloud','sign','cpanel']);
 
 if (isset($options['plugins'])) {
 	require(__DIR__ . '/build/plugins.php');
@@ -178,6 +178,10 @@ if (isset($options['nextcloud'])) {
 	require(__DIR__ . '/build/nextcloud.php');
 }
 
+if (isset($options['cpanel'])) {
+	require(__DIR__ . '/build/cpanel.php');
+}
+
 rename("snappymail/v/{$package->version}", 'snappymail/v/0.0.0');
 
 file_put_contents("{$destPath}core.json", '{
diff --git a/snappymail/v/0.0.0/app/domains/default.json b/snappymail/v/0.0.0/app/domains/default.json
index 14ab64608..49a9cba54 100644
--- a/snappymail/v/0.0.0/app/domains/default.json
+++ b/snappymail/v/0.0.0/app/domains/default.json
@@ -1,18 +1,50 @@
 {
-    "imapHost": "localhost",
-    "imapPort": 143,
-    "imapSecure": 0,
-    "imapShortLogin": false,
-    "useSieve": false,
-    "sieveHost": "localhost",
-    "sievePort": 4190,
-    "sieveSecure": 0,
-    "smtpHost": "localhost",
-    "smtpPort": 25,
-    "smtpSecure": 0,
-    "smtpShortLogin": false,
-    "smtpAuth": true,
-    "smtpSetSender": false,
-    "smtpPhpMail": false,
+    "name": "*",
+    "IMAP": {
+        "host": "localhost",
+        "port": 143,
+        "type": 0,
+        "shortLogin": false,
+        "ssl": {
+            "verify_peer": false,
+            "verify_peer_name": false,
+            "allow_self_signed": false,
+            "SNI_enabled": true,
+            "disable_compression": true,
+            "security_level": 1
+        }
+    },
+    "SMTP": {
+        "host": "localhost",
+        "port": 25,
+        "type": 0,
+        "shortLogin": false,
+        "ssl": {
+            "verify_peer": false,
+            "verify_peer_name": false,
+            "allow_self_signed": false,
+            "SNI_enabled": true,
+            "disable_compression": true,
+            "security_level": 1
+        },
+        "useAuth": false,
+        "setSender": false,
+        "usePhpMail": false
+    },
+    "Sieve": {
+        "host": "localhost",
+        "port": 4190,
+        "type": 0,
+        "shortLogin": false,
+        "ssl": {
+            "verify_peer": false,
+            "verify_peer_name": false,
+            "allow_self_signed": false,
+            "SNI_enabled": true,
+            "disable_compression": true,
+            "security_level": 1
+        },
+        "enabled": true
+    },
     "whiteList": ""
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
index aedc2625b..fa77a5ee5 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
@@ -501,180 +501,6 @@ abstract class Utils
 		return false === $iLast ? '' : \strtolower(\substr($sFileName, $iLast + 1));
 	}
 
-	public static function MimeContentType(string $sFileName) : string
-	{
-		$sResult = 'application/octet-stream';
-		$sFileName = \trim(\strtolower($sFileName));
-
-		if ('winmail.dat' === $sFileName)
-		{
-			return 'application/ms-tnef';
-		}
-
-		$aMimeTypes = array(
-
-			'eml'	=> 'message/rfc822',
-			'mime'	=> 'message/rfc822',
-			'txt'	=> 'text/plain',
-			'text'	=> 'text/plain',
-			'def'	=> 'text/plain',
-			'list'	=> 'text/plain',
-			'in'	=> 'text/plain',
-			'ini'	=> 'text/plain',
-			'log'	=> 'text/plain',
-			'sql'	=> 'text/plain',
-			'cfg'	=> 'text/plain',
-			'conf'	=> 'text/plain',
-			'rtx'	=> 'text/richtext',
-			'vcard'	=> 'text/vcard',
-			'vcf'	=> 'text/vcard',
-			'htm'	=> 'text/html',
-			'html'	=> 'text/html',
-			'csv'	=> 'text/csv',
-			'ics'	=> 'text/calendar',
-			'ifb'	=> 'text/calendar',
-			'xml'	=> 'text/xml',
-			'json'	=> 'application/json',
-			'swf'	=> 'application/x-shockwave-flash',
-			'hlp'	=> 'application/winhlp',
-			'wgt'	=> 'application/widget',
-			'chm'	=> 'application/vnd.ms-htmlhelp',
-			'asc'   => 'application/pgp-signature',
-			'p10'	=> 'application/pkcs10',
-			'p7c'	=> 'application/pkcs7-mime',
-			'p7m'	=> 'application/pkcs7-mime',
-			'p7s'	=> 'application/pkcs7-signature',
-			'torrent'	=> 'application/x-bittorrent',
-
-			// scripts
-			'js'	=> 'application/javascript',
-			'pl'	=> 'text/perl',
-			'css'	=> 'text/css',
-			'asp'	=> 'text/asp',
-			'php'	=> 'application/x-php',
-
-			// images
-			'png'	=> 'image/png',
-			'jpg'	=> 'image/jpeg',
-			'jpeg'	=> 'image/jpeg',
-			'jpe'	=> 'image/jpeg',
-			'jfif'	=> 'image/jpeg',
-			'gif'	=> 'image/gif',
-			'bmp'	=> 'image/bmp',
-			'cgm'	=> 'image/cgm',
-			'ief'	=> 'image/ief',
-			'ico'	=> 'image/x-icon',
-			'tif'	=> 'image/tiff',
-			'tiff'	=> 'image/tiff',
-			'svg'	=> 'image/svg+xml',
-			'svgz'	=> 'image/svg+xml',
-			'djv'	=> 'image/vnd.djvu',
-			'djvu'	=> 'image/vnd.djvu',
-			'webp'	=> 'image/webp',
-
-			// archives
-			'zip'	=> 'application/zip',
-			'7z'	=> 'application/x-7z-compressed',
-			'rar'	=> 'application/x-rar-compressed',
-			'exe'	=> 'application/x-msdownload',
-			'dll'	=> 'application/x-msdownload',
-			'scr'	=> 'application/x-msdownload',
-			'com'	=> 'application/x-msdownload',
-			'bat'	=> 'application/x-msdownload',
-			'msi'	=> 'application/x-msdownload',
-			'cab'	=> 'application/vnd.ms-cab-compressed',
-			'gz'	=> 'application/x-gzip',
-			'tgz'	=> 'application/x-gzip',
-			'bz'	=> 'application/x-bzip',
-			'bz2'	=> 'application/x-bzip2',
-			'deb'	=> 'application/x-debian-package',
-			'tar'	=> 'application/x-tar',
-
-			// fonts
-			'psf'	=> 'application/x-font-linux-psf',
-			'otf'	=> 'application/x-font-otf',
-			'pcf'	=> 'application/x-font-pcf',
-			'snf'	=> 'application/x-font-snf',
-			'ttf'	=> 'application/x-font-ttf',
-			'ttc'	=> 'application/x-font-ttf',
-
-			// audio
-			'aac'	=> 'audio/aac',
-			'flac'	=> 'audio/flac',
-			'mp3'	=> 'audio/mpeg',
-			'aif'	=> 'audio/aiff',
-			'aifc'	=> 'audio/aiff',
-			'aiff'	=> 'audio/aiff',
-			'wav'	=> 'audio/x-wav',
-			'midi'	=> 'audio/midi',
-			'mp4a'	=> 'audio/mp4',
-			'ogg'	=> 'audio/ogg',
-			'weba'	=> 'audio/webm',
-			'm3u'	=> 'audio/x-mpegurl',
-
-			// video
-			'qt'	=> 'video/quicktime',
-			'mov'	=> 'video/quicktime',
-			'avi'	=> 'video/x-msvideo',
-			'mpg'	=> 'video/mpeg',
-			'mpeg'	=> 'video/mpeg',
-			'mpe'	=> 'video/mpeg',
-			'm1v'	=> 'video/mpeg',
-			'm2v'	=> 'video/mpeg',
-			'3gp'	=> 'video/3gpp',
-			'3g2'	=> 'video/3gpp2',
-			'h261'	=> 'video/h261',
-			'h263'	=> 'video/h263',
-			'h264'	=> 'video/h264',
-			'jpgv'	=> 'video/jpgv',
-			'mp4'	=> 'video/mp4',
-			'mp4v'	=> 'video/mp4',
-			'mpg4'	=> 'video/mp4',
-			'ogv'	=> 'video/ogg',
-			'webm'	=> 'video/webm',
-			'm4v'	=> 'video/x-m4v',
-			'asf'	=> 'video/x-ms-asf',
-			'asx'	=> 'video/x-ms-asf',
-			'wm'	=> 'video/x-ms-wm',
-			'wmv'	=> 'video/x-ms-wmv',
-			'wmx'	=> 'video/x-ms-wmx',
-			'wvx'	=> 'video/x-ms-wvx',
-			'movie'	=> 'video/x-sgi-movie',
-
-			// adobe
-			'pdf'	=> 'application/pdf',
-			'psd'	=> 'image/vnd.adobe.photoshop',
-			'ai'	=> 'application/postscript',
-			'eps'	=> 'application/postscript',
-			'ps'	=> 'application/postscript',
-
-			// ms office
-			'doc'	=> 'application/msword',
-			'dot'	=> 'application/msword',
-			'rtf'	=> 'application/rtf',
-			'xls'	=> 'application/vnd.ms-excel',
-			'ppt'	=> 'application/vnd.ms-powerpoint',
-			'docx'	=> 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-			'xlsx'	=> 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-			'dotx'	=> 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-			'pptx'	=> 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-
-			// open office
-			'odt'	=> 'application/vnd.oasis.opendocument.text',
-			'ods'	=> 'application/vnd.oasis.opendocument.spreadsheet',
-			'odp'	=> 'application/vnd.oasis.opendocument.presentation'
-
-		);
-
-		$sExt = static::GetFileExtension($sFileName);
-		if (\strlen($sExt) && isset($aMimeTypes[$sExt]))
-		{
-			$sResult = $aMimeTypes[$sExt];
-		}
-
-		return $sResult;
-	}
-
 	public static function ContentTypeType(string $sContentType, string $sFileName) : string
 	{
 		$sContentType = \strtolower($sContentType);
@@ -695,6 +521,7 @@ abstract class Utils
 			case 'application/x-bzip2':
 			case 'application/x-debian-package':
 			case 'application/x-tar':
+			case 'application/gtar':
 				return 'archive';
 
 			case 'application/msword':
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
index 615cf2c79..105c94ab3 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
@@ -120,15 +120,15 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function Login(array $aCredentials) : self
+	public function Login(Settings $oSettings) : self
 	{
-		if (!empty($aCredentials['ProxyAuthUser']) && !empty($aCredentials['ProxyAuthPassword'])) {
-			$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($aCredentials['ProxyAuthUser']));
-			$sPassword = $aCredentials['ProxyAuthPassword'];
-			$sProxyAuthUser = $aCredentials['Login'];
+		if (!empty($oSettings->ProxyAuthUser) && !empty($oSettings->ProxyAuthPassword)) {
+			$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($oSettings->ProxyAuthUser));
+			$sPassword = $oSettings->ProxyAuthPassword;
+			$sProxyAuthUser = $oSettings->Login;
 		} else {
-			$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($aCredentials['Login']));
-			$sPassword = $aCredentials['Password'];
+			$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($oSettings->Login));
+			$sPassword = $oSettings->Password;
 			$sProxyAuthUser = '';
 		}
 
@@ -142,7 +142,7 @@ class ImapClient extends \MailSo\Net\NetClient
 		$this->sLogginedUser = $sLogin;
 
 		$type = $this->IsSupported('LOGINDISABLED') ? '' : 'LOGIN'; // RFC3501 6.2.3
-		foreach ($aCredentials['SASLMechanisms'] as $sasl_type) {
+		foreach ($oSettings->SASLMechanisms as $sasl_type) {
 			if ($this->IsSupported("AUTH={$sasl_type}") && \SnappyMail\SASL::isSupported($sasl_type)) {
 				$type = $sasl_type;
 				break;
@@ -151,7 +151,7 @@ class ImapClient extends \MailSo\Net\NetClient
 		if (!$type) {
 			if (!$this->Encrypted() && $this->IsSupported('STARTTLS')) {
 				$this->StartTLS();
-				return $this->Login($aCredentials);
+				return $this->Login($oSettings);
 			}
 			throw new \MailSo\RuntimeException('No supported SASL mechanism found, remote server wants: '
 				. \implode(', ', \array_filter($this->Capability() ?: [], function($var){
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
new file mode 100644
index 000000000..85bfaa872
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2022 DJMaze
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo\Imap;
+
+/**
+ * @category MailSo
+ * @package Net
+ */
+class Settings extends \MailSo\Net\ConnectSettings
+{
+	public int $port = 143;
+
+/*
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
+	{
+		return \array_merge(
+			parent::jsonSerialize(),
+			[
+//				'@Object' => 'Object/ImapSettings',
+			]
+		);
+	}
+*/
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index dc8e191e0..ed40d00fa 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -619,7 +619,7 @@ class MailClient
 		}
 		catch (\MailSo\RuntimeException $oException)
 		{
-			\SnappyMail\Log::warning('MessageListThreadsMap ' . $oException->getMessage());
+			\SnappyMail\Log::warning('MailClient', 'MessageListThreadsMap ' . $oException->getMessage());
 			unset($oException);
 		}
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Attachment.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Attachment.php
index a81493c41..10ef808da 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Attachment.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Attachment.php
@@ -22,46 +22,28 @@ class Attachment
 	 */
 	private $rResource;
 
-	/**
-	 * @var string
-	 */
-	private $sFileName;
+	private string $sFileName;
 
-	/**
-	 * @var int
-	 */
-	private $iFileSize;
+	private int $iFileSize;
 
-	/**
-	 * @var string
-	 */
-	private $sCID;
+	private string $sCID;
 
-	/**
-	 * @var bool
-	 */
-	private $bIsInline;
+	private bool $bIsInline;
 
-	/**
-	 * @var bool
-	 */
-	private $bIsLinked;
+	private bool $bIsLinked;
 
-	/**
-	 * @var array
-	 */
-	private $aCustomContentTypeParams;
+	private array $aCustomContentTypeParams;
 
-	/**
-	 * @var string
-	 */
-	private $sContentLocation;
+	private string $sContentLocation;
+
+	private string $sContentType;
 
 	/**
 	 * @param resource $rResource
 	 */
 	function __construct($rResource, string $sFileName, int $iFileSize, bool $bIsInline,
-		bool $bIsLinked, string $sCID, array $aCustomContentTypeParams = [], string $sContentLocation = '')
+		bool $bIsLinked, string $sCID, array $aCustomContentTypeParams = [],
+		string $sContentLocation = '', string $sContentType = '')
 	{
 		$this->rResource = $rResource;
 		$this->sFileName = $sFileName;
@@ -71,6 +53,10 @@ class Attachment
 		$this->sCID = $sCID;
 		$this->aCustomContentTypeParams = $aCustomContentTypeParams;
 		$this->sContentLocation = $sContentLocation;
+		$this->sContentType = $sContentType
+			?: \SnappyMail\File\MimeType::fromStream($rResource, $sFileName)
+			?: \SnappyMail\File\MimeType::fromFilename($sFileName)
+			?: 'application/octet-stream';
 	}
 
 	/**
@@ -83,7 +69,7 @@ class Attachment
 
 	public function ContentType() : string
 	{
-		return \MailSo\Base\Utils::MimeContentType($this->sFileName);
+		return $this->sContentType;
 	}
 
 	public function CustomContentTypeParams() : array
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php
index 047712430..a62b97daf 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php
@@ -257,19 +257,12 @@ class Email implements \JsonSerializable
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize()
 	{
-/*
-		$BIMI = '';
-		if (Enumerations\DkimStatus::PASS == $this->GetDkimStatus()) {
-			$BIMI = \SnappyMail\DNS\BIMI($this->GetDomain());
-		}
-*/
 		return array(
 			'@Object' => 'Object/Email',
 			'Name' => \MailSo\Base\Utils::Utf8Clear($this->GetDisplayName()),
 			'Email' => \MailSo\Base\Utils::Utf8Clear($this->GetEmail(true)),
 			'DkimStatus' => $this->GetDkimStatus(),
 			'DkimValue' => $this->GetDkimValue()
-//			'BIMI' => $BIMI
 		);
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/MimeType.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/MimeType.php
deleted file mode 100644
index 625b587b6..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/MimeType.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Mime\Enumerations;
-
-/**
- * @category MailSo
- * @package Mime
- * @subpackage Enumerations
- */
-abstract class MimeType
-{
-	const TEXT_PLAIN = 'text/plain';
-
-	const MULTIPART_ALTERNATIVE = 'multipart/alternative';
-	const MULTIPART_RELATED = 'multipart/related';
-	const MULTIPART_MIXED = 'multipart/mixed';
-
-	const MULTIPART_SIGNED = 'multipart/signed';
-	const APPLICATION_PGP_SIGNATURE = 'application/pgp-signature';
-
-	const MULTIPART_ENCRYPTED = 'multipart/encrypted';
-	const APPLICATION_PGP_ENCRYPTED = 'application/pgp-encrypted';
-	const APPLICATION_OCTET_STREAM = 'application/octet-stream';
-
-	const MESSAGE_RFC822 = 'message/rfc822';
-	const MESSAGE_PARTIAL = 'message/partial';
-	const MESSAGE_REPORT = 'message/report';
-
-	const APPLICATION_MS_TNEF = 'application/ms-tnef';
-	const APPLICATION_PKCS7_MIME = 'application/pkcs7-mime';
-	const APPLICATION_PKCS7_SIGNATURE = 'application/pkcs7-signature';
-}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php
index 0639cd8e7..664a3a241 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php
@@ -387,10 +387,7 @@ class Message extends Part
 				if ($oAttachment->IsLinked()) {
 					$oRelatedPart = new Part;
 					$oRelatedPart->Headers->append(
-						new Header(
-							Enumerations\Header::CONTENT_TYPE,
-							Enumerations\MimeType::MULTIPART_RELATED
-						)
+						new Header(Enumerations\Header::CONTENT_TYPE, 'multipart/related')
 					);
 					$oRelatedPart->SubParts->append($oRootPart);
 					$oRootPart = $oRelatedPart;
@@ -399,10 +396,7 @@ class Message extends Part
 			}
 		} else {
 			$oRootPart = new Part;
-			$oRootPart->Headers->AddByName(
-				Enumerations\Header::CONTENT_TYPE,
-				Enumerations\MimeType::MULTIPART_MIXED
-			);
+			$oRootPart->Headers->AddByName(Enumerations\Header::CONTENT_TYPE, 'multipart/mixed');
 			$oRootPart->SubParts = $this->SubParts;
 		}
 
@@ -413,10 +407,7 @@ class Message extends Part
 			} else {
 				if (!$oMixedPart) {
 					$oMixedPart = new Part;
-					$oMixedPart->Headers->AddByName(
-						Enumerations\Header::CONTENT_TYPE,
-						Enumerations\MimeType::MULTIPART_MIXED
-					);
+					$oMixedPart->Headers->AddByName(Enumerations\Header::CONTENT_TYPE, 'multipart/mixed');
 					$oMixedPart->SubParts->append($oRootPart);
 					$oRootPart = $oMixedPart;
 				}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
index 8bb34edbd..101e14a11 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
@@ -15,66 +15,58 @@ namespace MailSo\Net;
  * @category MailSo
  * @package Net
  */
-class ConnectSettings
+class ConnectSettings implements \JsonSerializable
 {
-	public
-		$host,
+	public string $host;
 
-		$port,
+	public int $port;
 
-		// none, TLS, STARTTLS
-		$type = \MailSo\Net\Enumerations\ConnectionSecurityType::AUTO_DETECT,
+	// none, TLS, STARTTLS
+	public int $type = Enumerations\ConnectionSecurityType::AUTO_DETECT;
 
-		// https://www.php.net/context.ssl
-		$ssl = [
-//			'peer_name' => '',
-//			'peer_fingerprint' => '', // string | array
-			'verify_peer' => true,
-			'verify_peer_name' => true,
-			'allow_self_signed' => false,
-//			'cafile' => '',
-//			'capath' => '',
+	public SSLContext $ssl;
 
-//			'ciphers' => 'HIGH:!SSLv2:!SSLv3',
-			'SNI_enabled' => true,
-			'disable_compression' => true,
-			'security_level' => 1,
+	// Authentication settings use by all child classes
+	public bool $useAuth = true;
+	public bool $shortLogin = false;
+	public array $SASLMechanisms = [];
+	public string $Login = '';
+	public string $Password = '';
+	public string $ProxyAuthUser = '';
+	public string $ProxyAuthPassword = '';
 
-//			'local_cert' => '',
-//			'local_pk' => '',
-//			'passphrase' => '',
-
-//			'verify_depth' => 0,
-//			'capture_peer_cert' => false,
-//			'capture_peer_cert_chain' => false,
-		];
-
-	function __construct()
+	public function __construct()
 	{
-		// TODO: This should be moved to \RainLoop\Model\Domain
-		$oConfig = \RainLoop\API::Config();
-		$this->ssl['verify_peer'] = !!$oConfig->Get('ssl', 'verify_certificate', false);
-		$this->ssl['verify_peer_name'] = !!$oConfig->Get('ssl', 'verify_certificate', false);
-		$this->ssl['allow_self_signed'] = !!$oConfig->Get('ssl', 'allow_self_signed', true);
-		$this->ssl['security_level'] = (int) $oConfig->Get('ssl', 'security_level', 1);
-//		$this->ssl['local_cert'] = (string) $oConfig->Get('ssl', 'client_cert', '');
-//		$this->ssl['cafile'] = (string) $oConfig->Get('ssl', 'cafile', '');
-//		$this->ssl['capath'] = (string) $oConfig->Get('ssl', 'capath', '');
+		$this->ssl = new SSLContext;
+	}
+
+	public static function Host() : string
+	{
+		return \SnappyMail\IDN::toAscii($this->host);
 	}
 
 	public static function fromArray(array $aSettings) : self
 	{
-		$object = new self;
-		$object->host = $aSettings['Host'];
-		$object->port = $aSettings['Port'];
-		$object->type = $aSettings['Secure'];
-		$object->ssl['verify_peer'] = !empty($aSettings['VerifySsl']);
-		$object->ssl['verify_peer_name'] = !empty($aSettings['VerifySsl']);
-		$object->ssl['allow_self_signed'] = !empty($aSettings['AllowSelfSigned']);
-		if (!empty($aSettings['ClientCert'])) {
-			$object->ssl['local_cert'] = $aSettings['ClientCert'];
-		}
+		$object = new static;
+		$object->host = $aSettings['host'];
+		$object->port = $aSettings['port'];
+		$object->type = isset($aSettings['type']) ? $aSettings['type'] : $aSettings['secure'];
+		$object->shortLogin = !empty($aSettings['shortLogin']);
+		$object->ssl = SSLContext::fromArray($aSettings['ssl'] ?? []);
 		return $object;
 	}
 
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
+	{
+		return array(
+//			'@Object' => 'Object/ConnectSettings',
+			'host' => $this->host,
+			'port' => $this->port,
+			'type' => $this->type,
+			'shortLogin' => $this->shortLogin,
+			'ssl' => $this->ssl
+		);
+	}
+
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
index ed0e78ba4..3d28ca305 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
@@ -162,13 +162,9 @@ abstract class NetClient
 		$this->iStartConnectTime = \microtime(true);
 		$this->writeLog('Start connection to "'.$this->sConnectedHost.':'.$this->iConnectedPort.'"');
 
-		$aStreamContextSettings = array(
-			'ssl' => $oSettings->ssl
-		);
-
-		\MailSo\Hooks::Run('Net.NetClient.StreamContextSettings/Filter', array(&$aStreamContextSettings));
-
-		$rStreamContext = \stream_context_create($aStreamContextSettings);
+		$rStreamContext = \stream_context_create(array(
+			'ssl' => $oSettings->ssl->jsonSerialize()
+		));
 
 		\set_error_handler(array($this, 'capturePhpErrorWithException'));
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/SSLContext.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/SSLContext.php
new file mode 100644
index 000000000..e34972061
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/SSLContext.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2022 DJMaze
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * https://www.php.net/context.ssl
+ */
+
+namespace MailSo\Net;
+
+/**
+ * @category MailSo
+ * @package Net
+ */
+class SSLContext implements \JsonSerializable
+{
+//	public string $peer_name = '';
+//	public string $peer_fingerprint = '';
+	public bool $verify_peer = true;
+	public bool $verify_peer_name = true;
+	public bool $allow_self_signed = false;
+	public string $cafile = '';
+	public string $capath = '';
+//	public string $ciphers = 'HIGH:!SSLv2:!SSLv3';
+	public bool $SNI_enabled = true;
+	public bool $disable_compression = true;
+	public int $security_level = 1;
+	public string $local_cert = '';
+//	public string $local_pk = '';
+//	public string $passphrase = '';
+//	public int $verify_depth = 0;
+//	public bool $capture_peer_cert = false;
+//	public bool $capture_peer_cert_chain = false;
+
+	public function __construct()
+	{
+		$oConfig = \RainLoop\API::Config();
+		$this->verify_peer = !!$oConfig->Get('ssl', 'verify_certificate', true);
+		$this->verify_peer_name = !!$oConfig->Get('ssl', 'verify_certificate', true);
+		$this->allow_self_signed = !!$oConfig->Get('ssl', 'allow_self_signed', false);
+		$this->cafile = \trim($oConfig->Get('ssl', 'cafile', ''));
+		$this->capath = \trim($oConfig->Get('ssl', 'capath', ''));
+		$this->disable_compression = !!$oConfig->Get('ssl', 'disable_compression', true);
+		$this->security_level = (int) $oConfig->Get('ssl', 'security_level', 1);
+		$this->local_cert = \trim($oConfig->Get('ssl', 'local_cert', ''));
+	}
+
+	public static function fromArray(array $settings) : self
+	{
+		$object = new static;
+		foreach ($settings as $key => $value) {
+			$object->$key = $value;
+		}
+		return $object;
+	}
+
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
+	{
+		$aResult = \get_object_vars($this);
+//		$aResult['@Object'] = 'Object/SSLContext';
+		return \array_filter(
+			$aResult,
+			function($var){return !\is_string($var) || \strlen($var);}
+		);
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php
new file mode 100644
index 000000000..02ee69f5e
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2022 DJMaze
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo\Sieve;
+
+/**
+ * @category MailSo
+ * @package Net
+ */
+class Settings extends \MailSo\Net\ConnectSettings
+{
+	public int $port = 4190;
+
+	public bool $enabled = false;
+
+	public bool $initialAuthPlain = false;
+
+	public function __construct()
+	{
+		parent::__construct();
+		$oConfig = \RainLoop\API::Config();
+		$this->initialAuthPlain = !!$oConfig->Get('labs', 'sieve_auth_plain_initial', true);
+	}
+
+	public static function fromArray(array $aSettings) : self
+	{
+		$object = parent::fromArray($aSettings);
+		$object->enabled = !empty($aSettings['enabled']);
+		return $object;
+	}
+
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
+	{
+		return \array_merge(
+			parent::jsonSerialize(),
+			[
+//				'@Object' => 'Object/SmtpSettings',
+				'enabled' => $this->enabled
+			]
+		);
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
similarity index 96%
rename from snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php
rename to snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
index c67ca7c7a..b69c8ee76 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
@@ -17,7 +17,7 @@ use MailSo\Net\Enumerations\ConnectionSecurityType;
  * @category MailSo
  * @package Sieve
  */
-class ManageSieveClient extends \MailSo\Net\NetClient
+class SieveClient extends \MailSo\Net\NetClient
 {
 	/**
 	 * @var bool
@@ -100,10 +100,10 @@ class ManageSieveClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Sieve\Exceptions\*
 	 */
-	public function Login(array $aCredentials) : self
+	public function Login(Settings $oSettings) : self
 	{
-		$sLogin = $aCredentials['Login'];
-		$sPassword = $aCredentials['Password'];
+		$sLogin = $oSettings->Login;
+		$sPassword = $oSettings->Password;
 		$sLoginAuthKey = '';
 		if (!\strlen($sLogin) || !\strlen($sPassword))
 		{
@@ -113,8 +113,8 @@ class ManageSieveClient extends \MailSo\Net\NetClient
 		}
 
 		$type = '';
-		\array_push($aCredentials['SASLMechanisms'], 'PLAIN', 'LOGIN');
-		foreach ($aCredentials['SASLMechanisms'] as $sasl_type) {
+		\array_push($oSettings->SASLMechanisms, 'PLAIN', 'LOGIN');
+		foreach ($oSettings->SASLMechanisms as $sasl_type) {
 			if ($this->IsAuthSupported($sasl_type) && \SnappyMail\SASL::isSupported($sasl_type)) {
 				$type = $sasl_type;
 				break;
@@ -124,7 +124,7 @@ class ManageSieveClient extends \MailSo\Net\NetClient
 		if (!$type) {
 			if (!$this->Encrypted() && $this->IsSupported('STARTTLS')) {
 				$this->StartTLS();
-				return $this->Login($aCredentials);
+				return $this->Login($oSettings);
 			}
 			$this->writeLogException(
 				new \MailSo\Sieve\Exceptions\LoginException,
@@ -154,7 +154,7 @@ class ManageSieveClient extends \MailSo\Net\NetClient
 				$sAuth = $SASL->authenticate($sLogin, $sPassword, $sLoginAuthKey);
 				$this->oLogger && $this->oLogger->AddSecret($sAuth);
 
-				if ($aCredentials['InitialAuthPlain']) {
+				if ($oSettings->initialAuthPlain) {
 					$this->sendRaw("AUTHENTICATE \"{$type}\" \"{$sAuth}\"");
 				} else {
 					$this->sendRaw("AUTHENTICATE \"{$type}\" {".\strlen($sAuth).'+}');
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php
new file mode 100644
index 000000000..3ccdac36f
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2022 DJMaze
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo\Smtp;
+
+/**
+ * @category MailSo
+ * @package Net
+ */
+class Settings extends \MailSo\Net\ConnectSettings
+{
+	public int $port = 25;
+
+	public bool $usePhpMail = false;
+
+	public bool $setSender = false;
+
+	public string $Ehlo;
+
+	public static function fromArray(array $aSettings) : self
+	{
+		$object = parent::fromArray($aSettings);
+		$object->useAuth = !empty($aSettings['useAuth']);
+		$object->setSender = !empty($aSettings['setSender']);
+		$object->usePhpMail = !empty($aSettings['usePhpMail']);
+		return $object;
+	}
+
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
+	{
+		return \array_merge(
+			parent::jsonSerialize(),
+			[
+//				'@Object' => 'Object/SmtpSettings',
+				'useAuth' => $this->useAuth,
+				'setSender' => $this->setSender,
+				'usePhpMail' => $this->usePhpMail
+			]
+		);
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
index 53d162ee6..88d79ebee 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
@@ -137,16 +137,16 @@ class SmtpClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\*
 	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
-	public function Login(array $aCredentials) : self
+	public function Login(Settings $oSettings) : self
 	{
-		$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($aCredentials['Login']));
-		$sPassword = $aCredentials['Password'];
+		$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($oSettings->Login));
+		$sPassword = $oSettings->Password;
 
 		$type = '';
 		// https://github.com/the-djmaze/snappymail/pull/423
-//		$aCredentials['SASLMechanisms'][] = 'LOGIN';
-		\array_unshift($aCredentials['SASLMechanisms'], 'LOGIN');
-		foreach ($aCredentials['SASLMechanisms'] as $sasl_type) {
+//		$oSettings->SASLMechanisms[] = 'LOGIN';
+		\array_unshift($oSettings->SASLMechanisms, 'LOGIN');
+		foreach ($oSettings->SASLMechanisms as $sasl_type) {
 			if ($this->IsAuthSupported($sasl_type) && \SnappyMail\SASL::isSupported($sasl_type)) {
 				$type = $sasl_type;
 				break;
@@ -156,7 +156,7 @@ class SmtpClient extends \MailSo\Net\NetClient
 		if (!$type) {
 			if (!$this->Encrypted() && $this->IsSupported('STARTTLS')) {
 				$this->StartTLS();
-				return $this->Login($aCredentials);
+				return $this->Login($oSettings);
 			}
 			\trigger_error("SMTP {$this->GetConnectedHost()} no supported AUTH options. Disable login");
 			$this->writeLogException(
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index 4c6dda119..9e2c6c203 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -39,6 +39,8 @@ class Actions
 	const AUTH_SPEC_LOGOUT_TOKEN_KEY = 'smspeclogout';
 	const AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY = 'smspeclogoutcmk';
 
+	const APP_DUMMY = '********';
+
 	/**
 	 * @var \MailSo\Base\Http
 	 */
@@ -131,8 +133,9 @@ class Actions
 			if ('syslog' === $sLogFileName) {
 				$oDriver = new \MailSo\Log\Drivers\Syslog();
 			} else {
-				$sLogFileFullPath = \APP_PRIVATE_DATA . 'logs/' . $this->compileLogFileName($sLogFileName);
-				$oDriver = new \MailSo\Log\Drivers\File($sLogFileFullPath);
+				$sLogFileFullPath = \trim($this->oConfig->Get('logs', 'path', '')) ?: \APP_PRIVATE_DATA . 'logs';
+				\is_dir($sLogFileFullPath) || \mkdir($sLogFileFullPath, 0700, true);
+				$oDriver = new \MailSo\Log\Drivers\File($sLogFileFullPath . '/' . $this->compileLogFileName($sLogFileName));
 			}
 			$this->oLogger->append($oDriver
 				->SetTimeZone($this->oConfig->Get('logs', 'time_zone', 'UTC'))
@@ -507,7 +510,12 @@ class Actions
 			switch (true) {
 				default:
 				case $bForceFile:
-					$oDriver = new \MailSo\Cache\Drivers\File(APP_PRIVATE_DATA . 'cache', $sKey);
+					$sCacheDir = \trim($this->oConfig->Get('cache', 'path', '')) ?: APP_PRIVATE_DATA . 'cache';
+					\is_dir($sCacheDir) || \mkdir($sCacheDir, 0700, true);
+					$oDriver = new \MailSo\Cache\Drivers\File(
+						\trim($this->oConfig->Get('cache', 'path', APP_PRIVATE_DATA . 'cache')),
+						$sKey
+					);
 					break;
 
 				case ('APCU' === $sDriver) &&
@@ -564,13 +572,10 @@ class Actions
 			if ($this->oConfig->Get('logs', 'auth_logging', false)) {
 //				$this->oLoggerAuth->SetLevel(\LOG_WARNING);
 
-				$sAuthLogFileFullPath = \APP_PRIVATE_DATA . 'logs/' . $this->compileLogFileName(
-						$this->oConfig->Get('logs', 'auth_logging_filename', ''));
+				$sAuthLogFileFullPath = (\trim($this->oConfig->Get('logs', 'path', '') ?: \APP_PRIVATE_DATA . 'logs'))
+					. '/' . $this->compileLogFileName($this->oConfig->Get('logs', 'auth_logging_filename', ''));
 				$sLogFileDir = \dirname($sAuthLogFileFullPath);
-				if (!\is_dir($sLogFileDir)) {
-					\mkdir($sLogFileDir, 0755, true);
-				}
-
+				\is_dir($sLogFileDir) || \mkdir($sLogFileDir, 0755, true);
 				$this->oLoggerAuth->append(
 					(new \MailSo\Log\Drivers\File($sAuthLogFileFullPath))
 						->DisableTimePrefix()
@@ -650,7 +655,7 @@ class Actions
 				$aResult['ContactsPdoDsn'] = (string)$oConfig->Get('contacts', 'pdo_dsn', '');
 				$aResult['ContactsPdoType'] = (string)$oConfig->Get('contacts', 'type', '');
 				$aResult['ContactsPdoUser'] = (string)$oConfig->Get('contacts', 'pdo_user', '');
-				$aResult['ContactsPdoPassword'] = (string)APP_DUMMY;
+				$aResult['ContactsPdoPassword'] = static::APP_DUMMY;
 
 				$aResult['FaviconUrl'] = $oConfig->Get('webmail', 'favicon_url', '');
 
@@ -684,17 +689,12 @@ class Actions
 					'MailToEmail' => '',
 
 					'ContactsIsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(),
-					'ContactsSyncIsAllowed' => (bool)$oConfig->Get('contacts', 'allow_sync', false),
-					'ContactsSyncInterval' => (int)$oConfig->Get('contacts', 'sync_interval', 20),
-					'ContactsSyncMode' => 0,
-					'ContactsSyncUrl' => '',
-					'ContactsSyncUser' => '',
-					'ContactsSyncPassword' => '',
 
 					'ViewHTML' => (bool) $oConfig->Get('defaults', 'view_html', true),
 					'ShowImages' => (bool) $oConfig->Get('defaults', 'show_images', false),
 					'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false),
 					'ListInlineAttachments' => false,
+					'simpleAttachmentsList' => false,
 					'MessagesPerPage' => (int) $oConfig->Get('webmail', 'messages_per_page', 25),
 					'MessageReadDelay' => (int) $oConfig->Get('webmail', 'message_read_delay', 5),
 					'MsgDefaultAction' => 1,
@@ -736,14 +736,15 @@ class Actions
 					)
 				);
 
-				if ($aResult['ContactsIsAllowed'] && $aResult['ContactsSyncIsAllowed']) {
-					$mData = $this->getContactsSyncData($oAccount);
-					if (\is_array($mData)) {
-						$aResult['ContactsSyncMode'] = isset($mData['Mode']) ? $mData['Mode'] : 0;
-						$aResult['ContactsSyncUrl'] = isset($mData['Url']) ? \trim($mData['Url']) : '';
-						$aResult['ContactsSyncUser'] = isset($mData['User']) ? \trim($mData['User']) : '';
-						$aResult['ContactsSyncPassword'] = APP_DUMMY;
-					}
+				if ($aResult['ContactsIsAllowed'] && $oConfig->Get('contacts', 'allow_sync', false)) {
+					$aData = $this->getContactsSyncData($oAccount) ?: [
+						'Mode' => 0,
+						'Url' => '',
+						'User' => ''
+					];
+					$aData['Password'] = empty($aData['Password']) ? '' : static::APP_DUMMY;
+					$aData['Interval'] = \max(20, \min(320, (int) $oConfig->Get('contacts', 'sync_interval', 20)));
+					$aResult['ContactsSync'] = $aData;
 				}
 
 				$sToken = Utils::GetCookie(self::AUTH_MAILTO_TOKEN_KEY);
@@ -788,11 +789,13 @@ class Actions
 					$aResult['requestDsn'] = (bool) $oSettings->GetConf('requestDsn', false);
 					$aResult['pgpSign'] = (bool) $oSettings->GetConf('pgpSign', false);
 					$aResult['pgpEncrypt'] = (bool) $oSettings->GetConf('pgpEncrypt', false);
+					$aResult['allowSpellcheck'] = (bool) $oSettings->GetConf('allowSpellcheck', false);
 
 					$aResult['ViewHTML'] = (bool)$oSettings->GetConf('ViewHTML', $aResult['ViewHTML']);
 					$aResult['ShowImages'] = (bool)$oSettings->GetConf('ShowImages', $aResult['ShowImages']);
 					$aResult['RemoveColors'] = (bool)$oSettings->GetConf('RemoveColors', $aResult['RemoveColors']);
 					$aResult['ListInlineAttachments'] = (bool)$oSettings->GetConf('ListInlineAttachments', $aResult['ListInlineAttachments']);
+					$aResult['simpleAttachmentsList'] = (bool)$oSettings->GetConf('simpleAttachmentsList', $aResult['simpleAttachmentsList']);
 					$aResult['ContactsAutosave'] = (bool)$oSettings->GetConf('ContactsAutosave', $aResult['ContactsAutosave']);
 					$aResult['MessagesPerPage'] = (int)$oSettings->GetConf('MessagesPerPage', $aResult['MessagesPerPage']);
 					$aResult['MessageReadDelay'] = (int)$oSettings->GetConf('MessageReadDelay', $aResult['MessageReadDelay']);
@@ -872,7 +875,8 @@ class Actions
 			? './?/Plugins/0/' . ($bAdmin ? 'Admin' : 'User') . '/' . $sStaticCache . '/'
 			: '';
 
-		$bAppJsDebug = $this->oConfig->Get('labs', 'use_app_debug_js', false);
+		$bAppJsDebug = $this->oConfig->Get('labs', 'use_app_debug_js', false)
+			|| $this->oConfig->Get('debug', 'enable', false);
 
 		$aResult['StaticLibsJs'] = Utils::WebStaticPath('js/' . ($bAppJsDebug ? '' : 'min/') .
 			'libs' . ($bAppJsDebug ? '' : '.min') . '.js');
@@ -993,18 +997,23 @@ class Actions
 
 		if ($oAccount && UPLOAD_ERR_OK === $iError && \is_array($aFile)) {
 			$sSavedName = 'upload-post-' . \md5($aFile['name'] . $aFile['tmp_name']);
+
+			// Detect content-type
+			$type = \SnappyMail\File\MimeType::fromFile($aFile['tmp_name'], $aFile['name'])
+				?: \SnappyMail\File\MimeType::fromFilename($aFile['name']);
+			if ($type) {
+				$aFile['type'] = $type;
+				$sSavedName .= \SnappyMail\File\MimeType::toExtension($type);
+			}
+
 			if (!$this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $aFile['tmp_name'])) {
 				$iError = Enumerations\UploadError::ON_SAVING;
 			} else {
-				$sUploadName = $aFile['name'];
-				$iSize = $aFile['size'];
-				$sMimeType = $aFile['type'];
-
 				$aResponse['Attachment'] = array(
-					'Name' => $sUploadName,
+					'Name' => $aFile['name'],
 					'TempName' => $sSavedName,
-					'MimeType' => $sMimeType,
-					'Size' => (int)$iSize
+					'MimeType' => $aFile['type'],
+					'Size' => (int) $aFile['size']
 				);
 			}
 		}
@@ -1022,87 +1031,6 @@ class Actions
 		return $this->DefaultResponse(__FUNCTION__, $aResponse);
 	}
 
-	public function UploadBackground(): array
-	{
-		$oAccount = $this->getAccountFromToken();
-
-		if (!$this->GetCapa(Enumerations\Capa::USER_BACKGROUND)) {
-			return $this->FalseResponse(__FUNCTION__);
-		}
-
-		$sName = '';
-		$sHash = '';
-
-		$aFile = $this->GetActionParam('File', null);
-		$iError = $this->GetActionParam('Error', Enumerations\UploadError::UNKNOWN);
-
-		if ($oAccount && UPLOAD_ERR_OK === $iError && \is_array($aFile)) {
-			$sMimeType = \strtolower(\MailSo\Base\Utils::MimeContentType($aFile['name']));
-			if (\in_array($sMimeType, array('image/png', 'image/jpg', 'image/jpeg'))) {
-				$sSavedName = 'upload-post-' . \md5($aFile['name'] . $aFile['tmp_name']);
-				if (!$this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $aFile['tmp_name'])) {
-					$iError = Enumerations\UploadError::ON_SAVING;
-				} else {
-					$rData = $this->FilesProvider()->GetFile($oAccount, $sSavedName);
-					if (\is_resource($rData)) {
-						$sData = \stream_get_contents($rData);
-						if (!empty($sData) && \strlen($sData)) {
-							$sName = $aFile['name'];
-							if (empty($sName)) {
-								$sName = '_';
-							}
-
-							if ($this->StorageProvider()->Put($oAccount,
-								Providers\Storage\Enumerations\StorageType::CONFIG,
-								'background',
-								Utils::jsonEncode(array(
-									'Name' => $aFile['name'],
-									'ContentType' => $sMimeType,
-									'Raw' => \base64_encode($sData)
-								))
-							)) {
-								$oSettings = $this->SettingsProvider()->Load($oAccount);
-								if ($oSettings) {
-									$sHash = \MailSo\Base\Utils::Sha1Rand($sName . APP_VERSION . APP_SALT);
-
-									$oSettings->SetConf('UserBackgroundName', $sName);
-									$oSettings->SetConf('UserBackgroundHash', $sHash);
-									$this->SettingsProvider()->Save($oAccount, $oSettings);
-								}
-							}
-						}
-
-						unset($sData);
-					}
-
-					if (\is_resource($rData)) {
-						\fclose($rData);
-					}
-
-					unset($rData);
-				}
-
-				$this->FilesProvider()->Clear($oAccount, $sSavedName);
-			} else {
-				$iError = Enumerations\UploadError::FILE_TYPE;
-			}
-		}
-
-		if (UPLOAD_ERR_OK !== $iError) {
-			$iClientError = Enumerations\UploadError::NORMAL;
-			$sError = $this->getUploadErrorMessageByCode($iError, $iClientError);
-
-			if (!empty($sError)) {
-				return $this->FalseResponse(__FUNCTION__, $iClientError, $sError);
-			}
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, !empty($sName) && !empty($sHash) ? array(
-			'Name' => $sName,
-			'Hash' => $sHash
-		) : false);
-	}
-
 	public function Capa(bool $bAdmin, ?Model\Account $oAccount = null): array
 	{
 		static $aResult;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
index 992433a44..4123834d9 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
@@ -22,8 +22,9 @@ trait Contacts
 		$bResult = $this->setContactsSyncData($oAccount, array(
 			'Mode' => \intval($this->GetActionParam('Mode', '0')),
 			'User' => $this->GetActionParam('User', ''),
-			'Password' => APP_DUMMY === $sPassword && isset($mData['Password'])
-				? $mData['Password'] : (APP_DUMMY === $sPassword ? '' : $sPassword),
+			'Password' => static::APP_DUMMY === $sPassword
+				? (isset($mData['Password']) ? $mData['Password'] : '')
+				: $sPassword,
 			'Url' => $this->GetActionParam('Url', '')
 		));
 
@@ -35,13 +36,13 @@ trait Contacts
 		$oAccount = $this->getAccountFromToken();
 		$oAddressBookProvider = $this->AddressBookProvider($oAccount);
 		if (!$oAddressBookProvider) {
-			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ContactsSyncError);
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'No AddressBookProvider');
 		}
 		\ignore_user_abort(true);
 		\SnappyMail\HTTP\Stream::start(/*$binary = false*/);
 		\SnappyMail\HTTP\Stream::JSON(['messsage'=>'start']);
 		if (!$oAddressBookProvider->Sync()) {
-			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ContactsSyncError);
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'AddressBookProvider->Sync() failed');
 		}
 		return $this->TrueResponse(__FUNCTION__);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
index 507ef448d..25ca344b7 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
@@ -10,6 +10,7 @@ use MailSo\Imap\SequenceSet;
 use MailSo\Imap\Enumerations\FetchType;
 use MailSo\Imap\Enumerations\MessageFlag;
 use MailSo\Mime\Part as MimePart;
+use MailSo\Mime\Enumerations\Header as MimeEnumHeader;
 
 trait Messages
 {
@@ -603,37 +604,53 @@ trait Messages
 		try
 		{
 			$aAttachments = $this->GetActionParam('Attachments', array());
-			if (\is_array($aAttachments) && \count($aAttachments))
-			{
-				$mResult = array();
-				foreach ($aAttachments as $sAttachment)
-				{
-					if ($aValues = \RainLoop\Utils::DecodeKeyValuesQ($sAttachment))
-					{
+			if (!\is_array($aAttachments)) {
+				$aAttachments = [];
+			}
+			if (\count($aAttachments)) {
+				$oFilesProvider = $this->FilesProvider();
+				foreach ($aAttachments as $mIndex => $sAttachment) {
+					$aAttachments[$mIndex] = false;
+					if ($aValues = \RainLoop\Utils::DecodeKeyValuesQ($sAttachment)) {
 						$sFolder = isset($aValues['Folder']) ? (string) $aValues['Folder'] : '';
 						$iUid = isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0;
 						$sMimeIndex = isset($aValues['MimeIndex']) ? (string) $aValues['MimeIndex'] : '';
 
-						$sTempName = \md5($sAttachment);
-						if (!$this->FilesProvider()->FileExists($oAccount, $sTempName))
-						{
+						$sTempName = \sha1($sAttachment);
+						if (!$oFilesProvider->FileExists($oAccount, $sTempName)) {
 							$this->MailClient()->MessageMimeStream(
-								function($rResource, $sContentType, $sFileName, $sMimeIndex = '') use ($oAccount, &$mResult, $sTempName, $sAttachment, $self) {
-									if (is_resource($rResource))
-									{
-										$sContentType = (empty($sFileName)) ? 'text/plain' : \MailSo\Base\Utils::MimeContentType($sFileName);
-										$sFileName = $self->MainClearFileName($sFileName, $sContentType, $sMimeIndex);
+								function($rResource, $sContentType, $sFileName, $sMimeIndex = '') use ($oAccount, $sTempName, $self, &$aAttachments, $mIndex) {
+									if (\is_resource($rResource)) {
+										$sContentType =
+											$sContentType
+											?: \SnappyMail\File\MimeType::fromStream($rResource, $sFileName)
+											?: \SnappyMail\File\MimeType::fromFilename($sFileName)
+											?: 'application/octet-stream'; // 'text/plain'
 
-										if ($self->FilesProvider()->PutFile($oAccount, $sTempName, $rResource))
-										{
-											$mResult[$sTempName] = $sAttachment;
+//										$sFileName = $self->MainClearFileName($sFileName, $sContentType, $sMimeIndex);
+										$sTempName .= \SnappyMail\File\MimeType::toExtension($sContentType);
+
+										if ($self->FilesProvider()->PutFile($oAccount, $sTempName, $rResource)) {
+											$aAttachments[$mIndex] = [
+//												'Name' => $sFileName,
+												'TempName' => $sTempName,
+												'MimeType' => $sContentType
+//												'Size' => 0
+											];
 										}
 									}
 								}, $sFolder, $iUid, $sMimeIndex);
-						}
-						else
-						{
-							$mResult[$sTempName] = $sAttachment;
+						} else {
+							$rResource = $oFilesProvider->GetFile($oAccount, $sTempName);
+							$sContentType = \SnappyMail\File\MimeType::fromStream($rResource, $sTempName)
+								?: \SnappyMail\File\MimeType::fromFilename($sTempName)
+								?: 'application/octet-stream'; // 'text/plain'
+							$aAttachments[$mIndex] = [
+//								'Name' => $sFileName,
+								'TempName' => $sTempName,
+								'MimeType' => $sContentType
+//								'Size' => $oFilesProvider->FileSize($oAccount, $sTempName)
+							];
 						}
 					}
 				}
@@ -644,7 +661,7 @@ trait Messages
 			throw new ClientException(Notifications::MailServerError, $oException);
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $mResult);
+		return $this->DefaultResponse(__FUNCTION__, $aAttachments);
 	}
 
 	/**
@@ -699,7 +716,7 @@ trait Messages
 					'text' => $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sBodyPartId.']'),
 					'signature' => ''
 				];
-				$decode = (new \MailSo\Mime\HeaderCollection($sBodyMime))->ValueByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING);
+				$decode = (new \MailSo\Mime\HeaderCollection($sBodyMime))->ValueByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING);
 				if ('base64' === $decode) {
 					$result['text'] = \base64_decode($result['text']);
 				} else if ('quoted-printable' === $decode) {
@@ -821,8 +838,8 @@ trait Messages
 								if ($this->Config()->Get('labs', 'mail_func_clear_headers', true))
 								{
 									$sMailHeaders = \MailSo\Base\Utils::RemoveHeaderFromHeaders($sMailHeaders, array(
-										\MailSo\Mime\Enumerations\Header::TO_,
-										\MailSo\Mime\Enumerations\Header::SUBJECT
+										MimeEnumHeader::TO_,
+										MimeEnumHeader::SUBJECT
 									));
 								}
 
@@ -1011,8 +1028,8 @@ trait Messages
 		$this->Plugins()->RunHook('filter.read-receipt-message-plain', array($oAccount, $oMessage, &$sText));
 
 		$oPart = new MimePart;
-		$oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'text/plain; charset="utf-8"');
-		$oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
+		$oPart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'text/plain; charset="utf-8"');
+		$oPart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
 		$oPart->Body = \MailSo\Base\StreamWrappers\Binary::CreateStream(
 			\MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\r?\\n/su', "\r\n", \trim($sText))),
 			'convert.quoted-printable-encode'
@@ -1114,7 +1131,7 @@ trait Messages
 
 			$oPart = new MimePart;
 			$oPart->Headers->AddByName(
-				\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
+				MimeEnumHeader::CONTENT_TYPE,
 				'multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="'.$sBoundary.'"'
 			);
 			$oPart->Body = $aSigned[1];
@@ -1127,22 +1144,22 @@ trait Messages
 		} else if ($sEncrypted = $this->GetActionParam('Encrypted', '')) {
 			$oPart = new MimePart;
 			$oPart->Headers->AddByName(
-				\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
+				MimeEnumHeader::CONTENT_TYPE,
 				'multipart/encrypted; protocol="application/pgp-encrypted"'
 			);
 			$oMessage->SubParts->append($oPart);
 
 			$oAlternativePart = new MimePart;
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/pgp-encrypted');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_DISPOSITION, 'attachment');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'application/pgp-encrypted');
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_DISPOSITION, 'attachment');
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, '7Bit');
 			$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString('Version: 1');
 			$oPart->SubParts->append($oAlternativePart);
 
 			$oAlternativePart = new MimePart;
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/octet-stream');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_DISPOSITION, 'inline; filename="msg.asc"');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'application/octet-stream');
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_DISPOSITION, 'inline; filename="msg.asc"');
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, '7Bit');
 			$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\r?\\n/su', "\r\n", \trim($sEncrypted)));
 			$oPart->SubParts->append($oAlternativePart);
 
@@ -1152,10 +1169,7 @@ trait Messages
 		} else {
 			if ($sHtml = $this->GetActionParam('Html', '')) {
 				$oPart = new MimePart;
-				$oPart->Headers->AddByName(
-					\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
-					\MailSo\Mime\Enumerations\MimeType::MULTIPART_ALTERNATIVE
-				);
+				$oPart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'multipart/alternative');
 				$oMessage->SubParts->append($oPart);
 
 				$sHtml = \MailSo\Base\HtmlUtils::BuildHtml($sHtml, $aFoundCids, $aFoundDataURL, $aFoundContentLocationUrls);
@@ -1165,8 +1179,8 @@ trait Messages
 				$sPlain = $this->GetActionParam('Text', '') ?: \MailSo\Base\HtmlUtils::ConvertHtmlToPlain($sHtml);
 				$this->Plugins()->RunHook('filter.message-plain', array($oAccount, $oMessage, &$sPlain));
 				$oAlternativePart = new MimePart;
-				$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'text/plain; charset=utf-8');
-				$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
+				$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'text/plain; charset=utf-8');
+				$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
 				$oAlternativePart->Body = \MailSo\Base\StreamWrappers\Binary::CreateStream(
 					\MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\r?\\n/su', "\r\n", \trim($sPlain))),
 					'convert.quoted-printable-encode'
@@ -1176,8 +1190,8 @@ trait Messages
 
 				// Now add HTML
 				$oAlternativePart = new MimePart;
-				$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'text/html; charset=utf-8');
-				$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
+				$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'text/html; charset=utf-8');
+				$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
 				$oAlternativePart->Body = \MailSo\Base\StreamWrappers\Binary::CreateStream(
 					\MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\r?\\n/su', "\r\n", \trim($sHtml))),
 					'convert.quoted-printable-encode'
@@ -1192,27 +1206,27 @@ trait Messages
 				if ($sSignature = $this->GetActionParam('Signature', null)) {
 					$oPart = new MimePart;
 					$oPart->Headers->AddByName(
-						\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
+						MimeEnumHeader::CONTENT_TYPE,
 						'multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"'
 					);
 					$oMessage->SubParts->append($oPart);
 
 					$oAlternativePart = new MimePart;
-					$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'text/plain; charset="utf-8"; protected-headers="v1"');
-					$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'base64');
+					$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'text/plain; charset="utf-8"; protected-headers="v1"');
+					$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, 'base64');
 					$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\r?\\n/su', "\r\n", \trim($sPlain)));
 					$oPart->SubParts->append($oAlternativePart);
 
 					$oAlternativePart = new MimePart;
-					$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/pgp-signature; name="signature.asc"');
-					$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
+					$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'application/pgp-signature; name="signature.asc"');
+					$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, '7Bit');
 					$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\r?\\n/su', "\r\n", \trim($sSignature)));
 					$oPart->SubParts->append($oAlternativePart);
 				} else {
 					$this->Plugins()->RunHook('filter.message-plain', array($oAccount, $oMessage, &$sPlain));
 					$oAlternativePart = new MimePart;
-					$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'text/plain; charset="utf-8"');
-					$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
+					$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'text/plain; charset="utf-8"');
+					$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
 					$oAlternativePart->Body = \MailSo\Base\StreamWrappers\Binary::CreateStream(
 						\MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\r?\\n/su', "\r\n", \trim($sPlain))),
 						'convert.quoted-printable-encode'
@@ -1231,10 +1245,11 @@ trait Messages
 		{
 			foreach ($aAttachments as $sTempName => $aData)
 			{
-				$sFileName = (string) $aData[0];
-				$bIsInline = (bool) $aData[1];
-				$sCID = (string) $aData[2];
-				$sContentLocation = isset($aData[3]) ? (string) $aData[3] : '';
+				$sFileName = (string) $aData['name'];
+				$bIsInline = (bool) $aData['inline'];
+				$sCID = (string) $aData['cid'];
+				$sContentLocation = (string) $aData['location'];
+				$sMimeType = (string) $aData['type'];
 
 				$rResource = $this->FilesProvider()->GetFile($oAccount, $sTempName);
 				if (\is_resource($rResource))
@@ -1244,7 +1259,7 @@ trait Messages
 					$oMessage->Attachments()->append(
 						new \MailSo\Mime\Attachment($rResource, $sFileName, $iFileSize, $bIsInline,
 							\in_array(trim(trim($sCID), '<>'), $aFoundCids),
-							$sCID, array(), $sContentLocation
+							$sCID, array(), $sContentLocation, $sMimeType
 						)
 					);
 				}
@@ -1302,7 +1317,7 @@ trait Messages
 
 			$oPart = new MimePart;
 			$oPart->Headers->AddByName(
-				\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
+				MimeEnumHeader::CONTENT_TYPE,
 				'multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"'
 			);
 			$oMessage->SubParts->append($oPart);
@@ -1312,8 +1327,8 @@ trait Messages
 			$oPart->SubParts->append($oBody);
 
 			$oSignaturePart = new MimePart;
-			$oSignaturePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/pgp-signature; name="signature.asc"');
-			$oSignaturePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
+			$oSignaturePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'application/pgp-signature; name="signature.asc"');
+			$oSignaturePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, '7Bit');
 			$oSignaturePart->Body = $sSignature;
 			$oPart->SubParts->append($oSignaturePart);
 		}
@@ -1337,22 +1352,22 @@ trait Messages
 
 			$oPart = new MimePart;
 			$oPart->Headers->AddByName(
-				\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
+				MimeEnumHeader::CONTENT_TYPE,
 				'multipart/encrypted; protocol="application/pgp-encrypted"'
 			);
 			$oMessage->SubParts->append($oPart);
 
 			$oAlternativePart = new MimePart;
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/pgp-encrypted');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_DISPOSITION, 'attachment');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'application/pgp-encrypted');
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_DISPOSITION, 'attachment');
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, '7Bit');
 			$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString('Version: 1');
 			$oPart->SubParts->append($oAlternativePart);
 
 			$oAlternativePart = new MimePart;
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/octet-stream');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_DISPOSITION, 'inline; filename="msg.asc"');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'application/octet-stream');
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_DISPOSITION, 'inline; filename="msg.asc"');
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, '7Bit');
 			$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString($sEncrypted);
 			$oPart->SubParts->append($oAlternativePart);
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
index d639eea6c..0e9c78f42 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
@@ -149,7 +149,9 @@ trait Raw
 			if ('.pdf' === \substr($sFileNameIn,-4)) {
 				$sContentTypeOut = 'application/pdf'; // application/octet-stream
 			} else {
-				$sContentTypeOut = $sContentTypeIn ?: \MailSo\Base\Utils::MimeContentType($sFileNameIn);
+				$sContentTypeOut = $sContentTypeIn
+					?: \SnappyMail\File\MimeType::fromFilename($sFileNameIn)
+					?: 'application/octet-stream';
 			}
 
 			$sFileNameOut = $this->MainClearFileName($sFileNameIn, $sContentTypeIn, $sMimeIndex);
@@ -197,10 +199,12 @@ trait Raw
 					if ('.pdf' === \substr($sFileName, -4)) {
 						// https://github.com/the-djmaze/snappymail/issues/144
 						$sContentType = 'application/pdf';
-					} else if ($sContentTypeIn) {
-						$sContentType = $sContentTypeIn;
-					} else if (!$sContentType) {
-						$sContentType = $sFileName ? \MailSo\Base\Utils::MimeContentType($sFileName) : 'text/plain';
+					} else {
+						$sContentType = $sContentTypeIn
+							?: $sContentType
+//							?: \SnappyMail\File\MimeType::fromStream($rResource, $sFileName)
+							?: \SnappyMail\File\MimeType::fromFilename($sFileName)
+							?: 'application/octet-stream';
 					}
 
 					if (!$bDownload)
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
index 45d63cf66..b148c4aeb 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
@@ -127,4 +127,88 @@ trait Themes
 		return $bLess ? (new \LessPHP\lessc())->compile($mResult) : $mResult;
 //			: \str_replace(';}', '}', \preg_replace('/\\s*([:;{},])\\s*/', '\1', \preg_replace('/\\s+/', ' ', \preg_replace('#/\\*.*?\\*/#s', '', $mResult))));
 	}
+
+	public function UploadBackground(): array
+	{
+		$oAccount = $this->getAccountFromToken();
+
+		if (!$this->GetCapa(\RainLoop\Enumerations\Capa::USER_BACKGROUND)) {
+			return $this->FalseResponse(__FUNCTION__);
+		}
+
+		$sName = '';
+		$sHash = '';
+
+		$aFile = $this->GetActionParam('File', null);
+		$iError = $this->GetActionParam('Error', \RainLoop\Enumerations\UploadError::UNKNOWN);
+
+		if ($oAccount && UPLOAD_ERR_OK === $iError && \is_array($aFile)) {
+			$sMimeType = \SnappyMail\File\MimeType::fromFile($aFile['tmp_name'], $aFile['name'])
+				?: \SnappyMail\File\MimeType::fromFilename($aFile['name'])
+				?: $aFile['type'];
+			if (\in_array($sMimeType, array('image/png', 'image/jpg', 'image/jpeg', 'image/webp'))) {
+				$sSavedName = 'upload-post-' . \md5($aFile['name'] . $aFile['tmp_name'])
+					. \SnappyMail\File\MimeType::toExtension($sMimeType);
+				if (!$this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $aFile['tmp_name'])) {
+					$iError = \RainLoop\Enumerations\UploadError::ON_SAVING;
+				} else {
+					$rData = $this->FilesProvider()->GetFile($oAccount, $sSavedName);
+					if (\is_resource($rData)) {
+						$sData = \stream_get_contents($rData);
+						if (!empty($sData) && \strlen($sData)) {
+							$sName = $aFile['name'];
+							if (empty($sName)) {
+								$sName = '_';
+							}
+
+							if ($this->StorageProvider()->Put($oAccount,
+								\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
+								'background',
+								\RainLoop\Utils::jsonEncode(array(
+									'Name' => $aFile['name'],
+									'ContentType' => $sMimeType,
+									'Raw' => \base64_encode($sData)
+								))
+							)) {
+								$oSettings = $this->SettingsProvider()->Load($oAccount);
+								if ($oSettings) {
+									$sHash = \MailSo\Base\Utils::Sha1Rand($sName . APP_VERSION . APP_SALT);
+
+									$oSettings->SetConf('UserBackgroundName', $sName);
+									$oSettings->SetConf('UserBackgroundHash', $sHash);
+									$this->SettingsProvider()->Save($oAccount, $oSettings);
+								}
+							}
+						}
+
+						unset($sData);
+					}
+
+					if (\is_resource($rData)) {
+						\fclose($rData);
+					}
+
+					unset($rData);
+				}
+
+				$this->FilesProvider()->Clear($oAccount, $sSavedName);
+			} else {
+				$iError = \RainLoop\Enumerations\UploadError::FILE_TYPE;
+			}
+		}
+
+		if (UPLOAD_ERR_OK !== $iError) {
+			$iClientError = \RainLoop\Enumerations\UploadError::NORMAL;
+			$sError = $this->getUploadErrorMessageByCode($iError, $iClientError);
+
+			if (!empty($sError)) {
+				return $this->FalseResponse(__FUNCTION__, $iClientError, $sError);
+			}
+		}
+
+		return $this->DefaultResponse(__FUNCTION__, !empty($sName) && !empty($sHash) ? array(
+			'Name' => $sName,
+			'Hash' => $sHash
+		) : false);
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
index dab59f712..39d1234f0 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
@@ -73,142 +73,123 @@ trait User
 	 */
 	public function DoAttachmentsActions() : array
 	{
-		if (!$this->GetCapa(Capa::ATTACHMENTS_ACTIONS))
-		{
+		$sAction = $this->GetActionParam('Do', '');
+		$aHashes = $this->GetActionParam('Hashes', null);
+		$oFilesProvider = $this->FilesProvider();
+		if (empty($sAction) || !$this->GetCapa(Capa::ATTACHMENTS_ACTIONS) || !$oFilesProvider || !$oFilesProvider->IsActive()) {
 			return $this->FalseResponse(__FUNCTION__);
 		}
 
 		$oAccount = $this->initMailClientConnection();
 
-		$sAction = $this->GetActionParam('Do', '');
-		$aHashes = $this->GetActionParam('Hashes', null);
-
-		$mResult = false;
 		$bError = false;
-		$aData = false;
+		$aData = [];
+		$mUIDs = [];
 
-		if (\is_array($aHashes) && \count($aHashes))
-		{
-			$aData = array();
-			foreach ($aHashes as $sZipHash)
-			{
+		if (\is_array($aHashes) && \count($aHashes)) {
+			foreach ($aHashes as $sZipHash) {
 				$aResult = $this->getMimeFileByHash($oAccount, $sZipHash);
-				if (!empty($aResult['FileHash']))
-				{
-					$aData[] = $aResult;
-				}
-				else
-				{
+				if (empty($aResult['FileHash'])) {
 					$bError = true;
 					break;
 				}
+				$aData[] = $aResult;
+				$mUIDs[$aResult['Uid']] = $aResult['Uid'];
 			}
 		}
+		$mUIDs = 1 < \count($mUIDs);
 
-		$oFilesProvider = $this->FilesProvider();
-		if (!empty($sAction) && !$bError && \is_array($aData) && \count($aData) &&
-			$oFilesProvider && $oFilesProvider->IsActive())
+		if ($bError || !\count($aData)) {
+			return $this->FalseResponse(__FUNCTION__);
+		}
+
+		$mResult = false;
+		switch (\strtolower($sAction))
 		{
-			$bError = false;
-			switch (\strtolower($sAction))
-			{
-				case 'zip':
+			case 'zip':
 
-					$sZipHash = \MailSo\Base\Utils::Sha1Rand();
-					$sZipFileName = $oFilesProvider->GenerateLocalFullFileName($oAccount, $sZipHash);
-
-					if (!empty($sZipFileName)) {
-						if (\class_exists('ZipArchive')) {
-							$oZip = new \ZipArchive();
-							$oZip->open($sZipFileName, \ZIPARCHIVE::CREATE | \ZIPARCHIVE::OVERWRITE);
-							$oZip->setArchiveComment('SnappyMail/'.APP_VERSION);
-							foreach ($aData as $aItem) {
-								$sFileName = (string) (isset($aItem['FileName']) ? $aItem['FileName'] : 'file.dat');
-								$sFileHash = (string) (isset($aItem['FileHash']) ? $aItem['FileHash'] : '');
-								if (!empty($sFileHash)) {
-									$sFullFileNameHash = $oFilesProvider->GetFileName($oAccount, $sFileHash);
-									if (!$oZip->addFile($sFullFileNameHash, $sFileName)) {
-										$bError = true;
-									}
-								}
-							}
-
-							if (!$bError) {
-								$bError = !$oZip->close();
-							} else {
-								$oZip->close();
-							}
-/*
-						} else {
-							@\unlink($sZipFileName);
-							$oZip = new \SnappyMail\Stream\ZIP($sZipFileName);
-//							$oZip->setArchiveComment('SnappyMail/'.APP_VERSION);
-							foreach ($aData as $aItem) {
-								$sFileName = (string) (isset($aItem['FileName']) ? $aItem['FileName'] : 'file.dat');
-								$sFileHash = (string) (isset($aItem['FileHash']) ? $aItem['FileHash'] : '');
-								if (!empty($sFileHash)) {
-									$sFullFileNameHash = $oFilesProvider->GetFileName($oAccount, $sFileHash);
-									if (!$oZip->addFile($sFullFileNameHash, $sFileName)) {
-										$bError = true;
-									}
-								}
-							}
-							$oZip->close();
-*/
-						} else {
-							@\unlink($sZipFileName);
-							$oZip = new \PharData($sZipFileName . '.zip', 0, null, \Phar::ZIP);
-							$oZip->compressFiles(\Phar::GZ);
-							foreach ($aData as $aItem) {
-								$sFileName = (isset($aItem['FileName']) ? (string) $aItem['FileName'] : 'file.dat');
-								$sFileHash = (isset($aItem['FileHash']) ? (string) $aItem['FileHash'] : '');
-								if ($sFileHash) {
-									$sFullFileNameHash = $oFilesProvider->GetFileName($oAccount, $sFileHash);
-									$oZip->addFile($sFullFileNameHash, $sFileName);
-								}
-							}
-							$oZip->compressFiles(\Phar::GZ);
-							unset($oZip);
-							\rename($sZipFileName . '.zip', $sZipFileName);
-						}
+				$sZipHash = \MailSo\Base\Utils::Sha1Rand();
+				$sZipFileName = $oFilesProvider->GenerateLocalFullFileName($oAccount, $sZipHash);
 
+				if (!empty($sZipFileName)) {
+					if (\class_exists('ZipArchive')) {
+						$oZip = new \ZipArchive();
+						$oZip->open($sZipFileName, \ZIPARCHIVE::CREATE | \ZIPARCHIVE::OVERWRITE);
+						$oZip->setArchiveComment('SnappyMail/'.APP_VERSION);
 						foreach ($aData as $aItem) {
-							$sFileHash = (isset($aItem['FileHash']) ? (string) $aItem['FileHash'] : '');
-							if ($sFileHash) {
-								$oFilesProvider->Clear($oAccount, $sFileHash);
+							$sFullFileNameHash = $oFilesProvider->GetFileName($oAccount, $aItem['FileHash']);
+							$sFileName = ($mUIDs ? "{$aItem['Uid']}/" : '') . ($aItem['FileName'] ?: 'file.dat');
+							if (!$oZip->addFile($sFullFileNameHash, $sFileName)) {
+								$bError = true;
 							}
 						}
 
-						if (!$bError) {
-							$mResult = array(
-								'FileHash' => Utils::EncodeKeyValuesQ(array(
-									'Account' => $oAccount ? $oAccount->Hash() : '',
-									'FileName' => 'attachments.zip',
-									'MimeType' => 'application/zip',
-									'FileHash' => $sZipHash
-								))
+						if ($bError) {
+							$oZip->close();
+						} else {
+							$bError = !$oZip->close();
+						}
+/*
+					} else {
+						@\unlink($sZipFileName);
+						$oZip = new \SnappyMail\Stream\ZIP($sZipFileName);
+//						$oZip->setArchiveComment('SnappyMail/'.APP_VERSION);
+						foreach ($aData as $aItem) {
+							$sFileName = (string) (isset($aItem['FileName']) ? $aItem['FileName'] : 'file.dat');
+							$sFileHash = (string) (isset($aItem['FileHash']) ? $aItem['FileHash'] : '');
+							if (!empty($sFileHash)) {
+								$sFullFileNameHash = $oFilesProvider->GetFileName($oAccount, $sFileHash);
+								if (!$oZip->addFile($sFullFileNameHash, $sFileName)) {
+									$bError = true;
+								}
+							}
+						}
+						$oZip->close();
+*/
+					} else {
+						@\unlink($sZipFileName);
+						$oZip = new \PharData($sZipFileName . '.zip', 0, null, \Phar::ZIP);
+						$oZip->compressFiles(\Phar::GZ);
+						foreach ($aData as $aItem) {
+							$oZip->addFile(
+								$oFilesProvider->GetFileName($oAccount, $aItem['FileHash']),
+								($mUIDs ? "{$aItem['Uid']}/" : '') . ($aItem['FileName'] ?: 'file.dat')
 							);
 						}
+						$oZip->compressFiles(\Phar::GZ);
+						unset($oZip);
+						\rename($sZipFileName . '.zip', $sZipFileName);
 					}
-					break;
 
-				default:
-					$data = new \SnappyMail\AttachmentsAction;
-					$data->action = $sAction;
-					$data->items = $aData;
-					$data->filesProvider = $oFilesProvider;
-					$data->account = $oAccount;
-					$this->Plugins()->RunHook('json.attachments', array($data));
-					$mResult = $data->result;
-					break;
-			}
-		}
-		else
-		{
-			$bError = true;
+					foreach ($aData as $aItem) {
+						$oFilesProvider->Clear($oAccount, $aItem['FileHash']);
+					}
+
+					if (!$bError) {
+						$mResult = array(
+							'FileHash' => Utils::EncodeKeyValuesQ(array(
+								'Account' => $oAccount ? $oAccount->Hash() : '',
+								'FileName' => 'attachments.zip',
+								'MimeType' => 'application/zip',
+								'FileHash' => $sZipHash
+							))
+						);
+					}
+				}
+				break;
+
+			default:
+				$data = new \SnappyMail\AttachmentsAction;
+				$data->action = $sAction;
+				$data->items = $aData;
+				$data->filesProvider = $oFilesProvider;
+				$data->account = $oAccount;
+				$this->Plugins()->RunHook('json.attachments', array($data));
+				$mResult = $data->result;
+				break;
 		}
 
-		$this->requestSleep();
+//		$this->requestSleep();
 		return $this->DefaultResponse(__FUNCTION__, $bError ? false : $mResult);
 	}
 
@@ -334,11 +315,13 @@ trait User
 		$this->setSettingsFromParams($oSettings, 'requestDsn', 'bool');
 		$this->setSettingsFromParams($oSettings, 'pgpSign', 'bool');
 		$this->setSettingsFromParams($oSettings, 'pgpEncrypt', 'bool');
+		$this->setSettingsFromParams($oSettings, 'allowSpellcheck', 'bool');
 
 		$this->setSettingsFromParams($oSettings, 'ViewHTML', 'bool');
 		$this->setSettingsFromParams($oSettings, 'ShowImages', 'bool');
 		$this->setSettingsFromParams($oSettings, 'RemoveColors', 'bool');
 		$this->setSettingsFromParams($oSettings, 'ListInlineAttachments', 'bool');
+		$this->setSettingsFromParams($oSettings, 'simpleAttachmentsList', 'bool');
 		$this->setSettingsFromParams($oSettings, 'ContactsAutosave', 'bool');
 		$this->setSettingsFromParams($oSettings, 'DesktopNotifications', 'bool');
 		$this->setSettingsFromParams($oSettings, 'SoundNotification', 'bool');
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
index 5d93c2117..ebb1ffe65 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
@@ -21,10 +21,8 @@ trait UserAuth
 	/**
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	public function LoginProcess(string &$sEmail, string &$sPassword, bool $bSignMe = false, bool $bMainAccount = true): Account
+	protected function resolveLoginCredentials(string &$sEmail, string &$sPassword, string &$sLogin): void
 	{
-		$sInputEmail = $sEmail;
-
 		$this->Plugins()->RunHook('login.credentials.step-1', array(&$sEmail));
 
 		$sEmail = \MailSo\Base\Utils::Trim($sEmail);
@@ -101,22 +99,30 @@ trait UserAuth
 
 		$this->Plugins()->RunHook('login.credentials.step-2', array(&$sEmail, &$sPassword));
 
-		if (!\str_contains($sEmail, '@') || !\strlen($sPassword)) {
-			$this->loginErrorDelay();
-
-			throw new ClientException(Notifications::InvalidInputArgument);
-		}
-
-		$this->Logger()->AddSecret($sPassword);
-
 		$sLogin = $sEmail;
 		if ($this->Config()->Get('login', 'login_lowercase', true)) {
 			$sLogin = \mb_strtolower($sLogin);
 		}
 
-		$this->Plugins()->RunHook('login.credentials', array(&$sEmail, &$sLogin, &$sPassword));
-
 		$this->Logger()->AddSecret($sPassword);
+		$this->Plugins()->RunHook('login.credentials', array(&$sEmail, &$sLogin, &$sPassword));
+		$this->Logger()->AddSecret($sPassword);
+	}
+
+	/**
+	 * @throws \RainLoop\Exceptions\ClientException
+	 */
+	public function LoginProcess(string &$sEmail, string &$sPassword, bool $bSignMe = false, bool $bMainAccount = true): Account
+	{
+		$sInputEmail = $sEmail;
+
+		$sLogin = '';
+		$this->resolveLoginCredentials($sEmail, $sPassword, $sLogin);
+
+		if (!\str_contains($sEmail, '@') || !\strlen($sPassword)) {
+			$this->loginErrorDelay();
+			throw new ClientException(Notifications::InvalidInputArgument);
+		}
 
 		$oAccount = null;
 		try {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
index d96e738fa..1be08fcd5 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
@@ -253,6 +253,23 @@ class ActionsAdmin extends Actions
 		));
 	}
 
+	public function DoAdminDomainMatch() : array
+	{
+		$sEmail = $this->GetActionParam('username');
+		$sPassword = '********';
+		$sLogin = '';
+		$this->resolveLoginCredentials($sEmail, $sPassword, $sLogin);
+		$oDomain = \str_contains($sEmail, '@')
+			? $this->DomainProvider()->Load(\MailSo\Base\Utils::GetDomainFromEmail($sEmail), true)
+			: null;
+		return $this->DefaultResponse(__FUNCTION__, array(
+			'email' => $sEmail,
+			'login' => $sLogin,
+			'domain' => $oDomain,
+			'whitelist' => $oDomain ? $oDomain->ValidateWhiteList($sEmail, $sLogin) : null
+		));
+	}
+
 	public function DoAdminDomainTest() : array
 	{
 		$this->IsAdminLoggined();
@@ -269,35 +286,21 @@ class ActionsAdmin extends Actions
 		$oDomain = $this->DomainProvider()->LoadOrCreateNewFromAction($this, 'test.example.com');
 		if ($oDomain)
 		{
+			$aAuth = $this->GetActionParam('auth');
+
 			try
 			{
 				$oImapClient = new \MailSo\Imap\ImapClient();
 				$oImapClient->SetLogger($this->Logger());
 				$oImapClient->SetTimeOuts($iConnectionTimeout);
 
-				$iTime = \microtime(true);
-				$oSettings = \MailSo\Net\ConnectSettings::fromArray($oDomain->ImapSettings());
+				$oSettings = $oDomain->ImapSettings();
 				$oImapClient->Connect($oSettings);
 
-				$sUsername = $this->GetActionParam('username', '');
-				if ($sUsername) {
-					$aSASLMechanisms = [];
-					$oConfig = $this->Config();
-					if ($oConfig->Get('labs', 'sasl_allow_scram_sha', false)) {
-						// https://github.com/the-djmaze/snappymail/issues/182
-						\array_push($aSASLMechanisms, 'SCRAM-SHA3-512', 'SCRAM-SHA-512', 'SCRAM-SHA-256', 'SCRAM-SHA-1');
-					}
-					if ($oConfig->Get('labs', 'sasl_allow_cram_md5', false)) {
-						$aSASLMechanisms[] = 'CRAM-MD5';
-					}
-					if ($oConfig->Get('labs', 'sasl_allow_plain', true)) {
-						$aSASLMechanisms[] = 'PLAIN';
-					}
-					$oImapClient->Login([
-						'Login' => $sUsername,
-						'Password' => $this->GetActionParam('password', ''),
-						'SASLMechanisms' => $aSASLMechanisms
-					]);
+				if (!empty($aAuth['user'])) {
+					$oSettings->Login = $aAuth['user'];
+					$oSettings->Password = $aAuth['pass'];
+					$oImapClient->Login($oSettings);
 				}
 
 				$oImapClient->Disconnect();
@@ -334,10 +337,15 @@ class ActionsAdmin extends Actions
 					$oSmtpClient->SetLogger($this->Logger());
 					$oSmtpClient->SetTimeOuts($iConnectionTimeout);
 
-					$iTime = \microtime(true);
-					$oSettings = \MailSo\Net\ConnectSettings::fromArray($oDomain->SmtpSettings());
+					$oSettings = $oDomain->SmtpSettings();
 					$oSmtpClient->Connect($oSettings, \MailSo\Smtp\SmtpClient::EhloHelper());
 
+					if (!empty($aAuth['user'])) {
+						$oSettings->Login = $aAuth['user'];
+						$oSettings->Password = $aAuth['pass'];
+						$oSmtpClient->Login($oSettings);
+					}
+
 					$oSmtpClient->Disconnect();
 					$bSmtpResult = true;
 				}
@@ -361,14 +369,19 @@ class ActionsAdmin extends Actions
 			{
 				try
 				{
-					$oSieveClient = new \MailSo\Sieve\ManageSieveClient();
+					$oSieveClient = new \MailSo\Sieve\SieveClient();
 					$oSieveClient->SetLogger($this->Logger());
 					$oSieveClient->SetTimeOuts($iConnectionTimeout);
 
-					$iTime = \microtime(true);
-					$oSettings = \MailSo\Net\ConnectSettings::fromArray($oDomain->SieveSettings());
+					$oSettings = $oDomain->SieveSettings();
 					$oSieveClient->Connect($oSettings);
 
+					if (!empty($aAuth['user'])) {
+						$oSettings->Login = $aAuth['user'];
+						$oSettings->Password = $aAuth['pass'];
+						$oSieveClient->Login($oSettings);
+					}
+
 					$oSieveClient->Disconnect();
 					$bSieveResult = true;
 				}
@@ -414,6 +427,14 @@ class ActionsAdmin extends Actions
 				'loaded' => \extension_loaded(\strtolower($name))
 			];
 		}
+		$aResult[] = [
+			'name' => 'Fileinfo',
+			'loaded' => \class_exists('finfo')
+		];
+		$aResult[] = [
+			'name' => 'Phar',
+			'loaded' => \class_exists('PharData')
+		];
 		return $this->DefaultResponse(__FUNCTION__, $aResult);
 	}
 
@@ -563,7 +584,7 @@ class ActionsAdmin extends Actions
 						if ($oItem) {
 							if ($oItem instanceof \RainLoop\Plugins\Property) {
 								if (PluginPropertyType::PASSWORD === $oItem->Type()) {
-									$oItem->SetValue(APP_DUMMY);
+									$oItem->SetValue(static::APP_DUMMY);
 								} else {
 									$oItem->SetValue($oConfig->Get('plugin', $oItem->Name(), ''));
 								}
@@ -572,7 +593,7 @@ class ActionsAdmin extends Actions
 								foreach ($oItem as $oSubItem) {
 									if ($oSubItem && $oSubItem instanceof \RainLoop\Plugins\Property) {
 										if (PluginPropertyType::PASSWORD === $oSubItem->Type()) {
-											$oSubItem->SetValue(APP_DUMMY);
+											$oSubItem->SetValue(static::APP_DUMMY);
 										} else {
 											$oSubItem->SetValue($oConfig->Get('plugin', $oSubItem->Name(), ''));
 										}
@@ -610,7 +631,7 @@ class ActionsAdmin extends Actions
 					{
 						$sKey = $oItem->Name();
 						$sValue = $aSettings[$sKey] ?? $oConfig->Get('plugin', $sKey);
-						if (PluginPropertyType::PASSWORD !== $oItem->Type() || APP_DUMMY !== $sValue)
+						if (PluginPropertyType::PASSWORD !== $oItem->Type() || static::APP_DUMMY !== $sValue)
 						{
 							$mResultValue = null;
 							switch ($oItem->Type()) {
@@ -730,8 +751,8 @@ class ActionsAdmin extends Actions
 					break;
 
 				case 'dummy':
-					$sValue = (string) $this->GetActionParam($sParamName, APP_DUMMY);
-					if (APP_DUMMY !== $sValue) {
+					$sValue = (string) $this->GetActionParam($sParamName, static::APP_DUMMY);
+					if (static::APP_DUMMY !== $sValue) {
 						$oConfig->Set($sConfigSector, $sConfigName, $sValue);
 					}
 					break;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
index b316ac4c0..b316f6aae 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
@@ -112,33 +112,12 @@ abstract class Api
 			\MailSo\Config::$BoundaryPrefix =
 				\trim(static::Config()->Get('labs', 'boundary_prefix', ''));
 
-			$sSslCafile = static::Config()->Get('ssl', 'cafile', '');
-			$sSslCapath = static::Config()->Get('ssl', 'capath', '');
-
 			Utils::$CookieDefaultPath = static::Config()->Get('labs', 'cookie_default_path', '');
 			Utils::$CookieSameSite = static::Config()->Get('security', 'cookie_samesite', 'Strict');
 			Utils::$CookieSecure = isset($_SERVER['HTTPS'])
 				|| 'None' == Utils::$CookieSameSite
 				|| !!static::Config()->Get('labs', 'cookie_default_secure', false);
 
-			if (!empty($sSslCafile) || !empty($sSslCapath))
-			{
-				\MailSo\Hooks::Add('Net.NetClient.StreamContextSettings/Filter', function ($aStreamContextSettings) use ($sSslCafile, $sSslCapath) {
-					if (isset($aStreamContextSettings['ssl']) && \is_array($aStreamContextSettings['ssl']))
-					{
-						if (empty($aStreamContextSettings['ssl']['cafile']) && !empty($sSslCafile))
-						{
-							$aStreamContextSettings['ssl']['cafile'] = $sSslCafile;
-						}
-
-						if (empty($aStreamContextSettings['ssl']['capath']) && !empty($sSslCapath))
-						{
-							$aStreamContextSettings['ssl']['capath'] = $sSslCapath;
-						}
-					}
-				});
-			}
-
 			\MailSo\Config::$CheckNewMessages = !!static::Config()->Get('labs', 'check_new_messages', true);
 		}
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
index aa0ef07aa..f0d6bf970 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
@@ -58,16 +58,7 @@ abstract class AbstractConfig implements \JsonSerializable
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize()
 	{
-		$aData = [];
-		foreach ($this->aData as $sSectionKey => $aSectionValue) {
-			if (\is_array($aSectionValue)) {
-				$aData[$sSectionKey] = [];
-				foreach ($aSectionValue as $sParamKey => $mParamValue) {
-					$aData[$sSectionKey][$sParamKey] = $mParamValue[0];
-				}
-			}
-		}
-		return $aData;
+		return $this->aData;;
 	}
 
 	/**
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 355e19caa..4967825c1 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -41,7 +41,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 
 		$sCipher = $this->Get('security', 'encrypt_cipher', '');
 		if (!$sCipher || !\SnappyMail\Crypt::cipherSupported($sCipher)) {
-			$sCipher && \SnappyMail\Log::warning("OpenSSL does not support {$sCipher}");
+			$sCipher && \SnappyMail\Log::warning('Crypt', "OpenSSL no support for cipher '{$sCipher}'");
 			$aCiphers = \SnappyMail\Crypt::listCiphers();
 			$this->Set('security', 'encrypt_cipher', $aCiphers[\array_rand($aCiphers)]);
 			$this->Save();
@@ -218,12 +218,13 @@ Default is "site=same-origin;site=none"')
 			),
 
 			'ssl' => array(
-				'verify_certificate' => array(false, 'Require verification of SSL certificate used.'),
-				'allow_self_signed'  => array(true, 'Allow self-signed certificates. Requires verify_certificate.'),
-				'security_level'     => array(1, 'https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_set_security_level.html'),
-				'cafile'             => array('', 'Location of Certificate Authority file on local filesystem (/etc/ssl/certs/ca-certificates.crt)'),
-				'capath'             => array('', 'capath must be a correctly hashed certificate directory. (/etc/ssl/certs/)'),
-				'client_cert'        => array('', 'Location of client certificate file (pem format with private key) on local filesystem'),
+				'verify_certificate'  => array(true, 'Require verification of SSL certificate used.'),
+				'allow_self_signed'   => array(false, 'Allow self-signed certificates. Requires verify_certificate.'),
+				'security_level'      => array(1, 'https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_set_security_level.html'),
+				'cafile'              => array('', 'Location of Certificate Authority file on local filesystem (/etc/ssl/certs/ca-certificates.crt)'),
+				'capath'              => array('', 'capath must be a correctly hashed certificate directory. (/etc/ssl/certs/)'),
+				'local_cert'          => array('', 'Location of client certificate file (pem format with private key) on local filesystem'),
+				'disable_compression' => array(true, 'This can help mitigate the CRIME attack vector.')
 			),
 
 			'capa' => array(
@@ -282,6 +283,8 @@ Values:
 
 				'enable' => array(false, 'Enable logging'),
 
+				'path' => array('', 'Path where log files will be stored'),
+
 				'level' => array(4, 'Log messages of set RFC 5424 section 6.2.1 Severity level and higher (0 = highest, 7 = lowest).
 0 = Emergency
 1 = Alert
@@ -342,6 +345,8 @@ Examples:
 
 Enables caching in the system'),
 
+				'path' => array('', 'Path where cache files will be stored'),
+
 				'index' => array('v1', 'Additional caching key. If changed, cache is purged'),
 
 				'fast_cache_driver' => array('files', 'Can be: files, APCU, memcache, redis (beta)'),
@@ -401,9 +406,6 @@ Enables caching in the system'),
 				'force_https' => array(false),
 				'custom_login_link' => array(''),
 				'custom_logout_link' => array(''),
-				'allow_external_login' => array(false),
-				'allow_external_sso' => array(false),
-				'external_sso_key' => array(''),
 				'http_client_ip_check_proxy' => array(false),
 				'fast_cache_memcache_host' => array('127.0.0.1'),
 				'fast_cache_memcache_port' => array(11211),
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
index 9c68aa76c..cab85f029 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
@@ -37,4 +37,19 @@ class Plugin extends \RainLoop\Config\AbstractConfig
 	{
 		return $this->aMap;
 	}
+
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
+	{
+		$aData = [];
+		foreach (parent::jsonSerialize() as $sSectionKey => $aSectionValue) {
+			if (\is_array($aSectionValue)) {
+				$aData[$sSectionKey] = [];
+				foreach ($aSectionValue as $sParamKey => $mParamValue) {
+					$aData[$sSectionKey][$sParamKey] = $mParamValue[0];
+				}
+			}
+		}
+		return $aData;
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
index 8ad441a4d..cac637b11 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
@@ -222,75 +222,48 @@ abstract class Account implements \JsonSerializable
 		$oImapClient->__FORCE_SELECT_ON_EXAMINE__ = !!$oConfig->Get('imap', 'use_force_selection');
 		$oImapClient->__DISABLE_METADATA = !!$oConfig->Get('imap', 'disable_metadata');
 
-		$aCredentials = \array_merge(
-			$this->Domain()->ImapSettings(),
-			array(
-				'Login' => $this->IncLogin(),
-				'VerifySsl' => !!$oConfig->Get('ssl', 'verify_certificate', false),
-				'AllowSelfSigned' => !!$oConfig->Get('ssl', 'allow_self_signed', true),
-				'ClientCert' => \trim($oConfig->Get('ssl', 'client_cert', ''))
-			)
-		);
+		$oSettings = $this->Domain()->ImapSettings();
+		$oSettings->Login = $this->IncLogin();
 
-		$oPlugins->RunHook('imap.before-connect', array($this, $oImapClient, &$aCredentials));
-		if ($aCredentials['UseConnect']) {
-			$oSettings = \MailSo\Net\ConnectSettings::fromArray($aCredentials);
-			$oImapClient->Connect($oSettings);
-		}
-		$oPlugins->RunHook('imap.after-connect', array($this, $oImapClient, $aCredentials));
+		$oPlugins->RunHook('imap.before-connect', array($this, $oImapClient, $oSettings));
+		$oImapClient->Connect($oSettings);
+		$oPlugins->RunHook('imap.after-connect', array($this, $oImapClient, $oSettings));
 
-		return $this->netClientLogin($oImapClient, $oConfig, $oPlugins, $aCredentials);
+		return $this->netClientLogin($oImapClient, $oPlugins, $oSettings);
 	}
 
 	public function SmtpConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Smtp\SmtpClient $oSmtpClient, \RainLoop\Config\Application $oConfig, bool &$bUsePhpMail = false) : bool
 	{
-		$aCredentials = \array_merge(
-			$this->Domain()->SmtpSettings(),
-			array(
-				'UseConnect' => !$bUsePhpMail,
-				'UsePhpMail' => $bUsePhpMail,
-				'Login' => $this->OutLogin(),
-				'VerifySsl' => !!$oConfig->Get('ssl', 'verify_certificate', false),
-				'AllowSelfSigned' => !!$oConfig->Get('ssl', 'allow_self_signed', true)
-			)
-		);
+		$oSettings = $this->Domain()->SmtpSettings();
+		$oSettings->Login = $this->OutLogin();
+		$oSettings->usePhpMail = $bUsePhpMail;
+		$oSettings->Ehlo = \MailSo\Smtp\SmtpClient::EhloHelper();
 
-		$oPlugins->RunHook('smtp.before-connect', array($this, $oSmtpClient, &$aCredentials));
-		$bUsePhpMail = $aCredentials['UsePhpMail'];
-		$aCredentials['UseAuth'] = $aCredentials['UseAuth'] && !$aCredentials['UsePhpMail'];
+		$oPlugins->RunHook('smtp.before-connect', array($this, $oSmtpClient, $oSettings));
+		$bUsePhpMail = $oSettings->usePhpMail;
+		$oSettings->useAuth = $oSettings->useAuth && !$oSettings->usePhpMail;
 
-		if ($aCredentials['UseConnect'] && !$aCredentials['UsePhpMail']) {
-			$oSettings = \MailSo\Net\ConnectSettings::fromArray($aCredentials);
-			$oSmtpClient->Connect($oSettings, $aCredentials['Ehlo']);
+		if (!$oSettings->usePhpMail) {
+			$oSmtpClient->Connect($oSettings, $oSettings->Ehlo);
 		}
-		$oPlugins->RunHook('smtp.after-connect', array($this, $oSmtpClient, $aCredentials));
+		$oPlugins->RunHook('smtp.after-connect', array($this, $oSmtpClient, $oSettings));
 
-		return $this->netClientLogin($oSmtpClient, $oConfig, $oPlugins, $aCredentials);
+		return $this->netClientLogin($oSmtpClient, $oPlugins, $oSettings);
 	}
 
-	public function SieveConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Sieve\ManageSieveClient $oSieveClient, \RainLoop\Config\Application $oConfig)
+	public function SieveConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Sieve\SieveClient $oSieveClient, \RainLoop\Config\Application $oConfig)
 	{
-		$aCredentials = \array_merge(
-			$this->Domain()->SieveSettings(),
-			array(
-				'Login' => $this->IncLogin(),
-				'VerifySsl' => !!$oConfig->Get('ssl', 'verify_certificate', false),
-				'AllowSelfSigned' => !!$oConfig->Get('ssl', 'allow_self_signed', true),
-				'InitialAuthPlain' => !!$oConfig->Get('labs', 'sieve_auth_plain_initial', true)
-			)
-		);
+		$oSettings = $this->Domain()->SieveSettings();
+		$oSettings->Login = $this->IncLogin();
 
-		$oPlugins->RunHook('sieve.before-connect', array($this, $oSieveClient, &$aCredentials));
-		if ($aCredentials['UseConnect']) {
-			$oSettings = \MailSo\Net\ConnectSettings::fromArray($aCredentials);
-			$oSieveClient->Connect($oSettings);
-		}
-		$oPlugins->RunHook('sieve.after-connect', array($this, $oSieveClient, $aCredentials));
+		$oPlugins->RunHook('sieve.before-connect', array($this, $oSieveClient, $oSettings));
+		$oSieveClient->Connect($oSettings);
+		$oPlugins->RunHook('sieve.after-connect', array($this, $oSieveClient, $oSettings));
 
-		return $this->netClientLogin($oSieveClient, $oConfig, $oPlugins, $aCredentials);
+		return $this->netClientLogin($oSieveClient, $oPlugins, $oSettings);
 	}
 
-	private function netClientLogin(\MailSo\Net\NetClient $oClient, \RainLoop\Config\Application $oConfig, \RainLoop\Plugins\Manager $oPlugins, array $aCredentials) : bool
+	private function netClientLogin(\MailSo\Net\NetClient $oClient, \RainLoop\Plugins\Manager $oPlugins, \MailSo\Net\ConnectSettings $oSettings) : bool
 	{
 /*
 		$encrypted = !empty(\stream_get_meta_data($oClient->ConnectionResource())['crypto']);
@@ -301,35 +274,15 @@ abstract class Account implements \JsonSerializable
 			[cipher_version] => TLSv1.3
 		)
 */
-		/**
-		 * TODO: move these to Admin -> Domains -> per Domain management?
-		 */
-		$aSASLMechanisms = [];
-		if ($oConfig->Get('labs', 'sasl_allow_scram_sha', false)) {
-			// https://github.com/the-djmaze/snappymail/issues/182
-			\array_push($aSASLMechanisms, 'SCRAM-SHA3-512', 'SCRAM-SHA-512', 'SCRAM-SHA-256', 'SCRAM-SHA-1');
-		}
-		if ($oConfig->Get('labs', 'sasl_allow_cram_md5', false)) {
-			$aSASLMechanisms[] = 'CRAM-MD5';
-		}
-		if ($oConfig->Get('labs', 'sasl_allow_plain', true)) {
-			$aSASLMechanisms[] = 'PLAIN';
-		}
-		$aCredentials = \array_merge(
-			$aCredentials,
-			array(
-				'Password' => $this->Password(),
-				'ProxyAuthUser' => $this->ProxyAuthUser(),
-				'ProxyAuthPassword' => $this->ProxyAuthPassword(),
-				'SASLMechanisms' => $aSASLMechanisms
-			)
-		);
+		$oSettings->Password = $this->Password();
+		$oSettings->ProxyAuthUser = $this->ProxyAuthUser();
+		$oSettings->ProxyAuthPassword = $this->ProxyAuthPassword();
 
 		$client_name = \strtolower($oClient->getLogName());
 
-		$oPlugins->RunHook("{$client_name}.before-login", array($this, $oClient, &$aCredentials));
-		$bResult = $aCredentials['UseAuth'] && $oClient->Login($aCredentials);
-		$oPlugins->RunHook("{$client_name}.after-login", array($this, $oClient, $bResult, $aCredentials));
+		$oPlugins->RunHook("{$client_name}.before-login", array($this, $oClient, $oSettings));
+		$bResult = !$oSettings->useAuth || $oClient->Login($oSettings);
+		$oPlugins->RunHook("{$client_name}.after-login", array($this, $oClient, $bResult, $oSettings));
 		return $bResult;
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
index 1a34ff223..386d26ca9 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
@@ -4,193 +4,81 @@ namespace RainLoop\Model;
 
 use MailSo\Net\Enumerations\ConnectionSecurityType;
 
+//	\SnappyMail\IDN::toAscii(
+//	\SnappyMail\IDN::toUtf8(
+
 class Domain implements \JsonSerializable
 {
-	/**
-	 * @var string
-	 */
-	private $sName;
+	private string $Name;
 
-	/**
-	 * @var string
-	 */
-	private $sIncHost;
+	private \MailSo\Imap\Settings $IMAP;
 
-	/**
-	 * @var int
-	 */
-	private $iIncPort;
+	private \MailSo\Smtp\Settings $SMTP;
 
-	/**
-	 * @var int
-	 */
-	private $iIncSecure;
+	private \MailSo\Sieve\Settings $Sieve;
 
-	/**
-	 * @var bool
-	 */
-	private $bIncShortLogin;
+	private string $whiteList = '';
 
-	/**
-	 * @var string
-	 */
-	private $sOutHost;
-
-	/**
-	 * @var int
-	 */
-	private $iOutPort;
-
-	/**
-	 * @var int
-	 */
-	private $iOutSecure;
-
-	/**
-	 * @var bool
-	 */
-	private $bOutShortLogin;
-
-	/**
-	 * @var bool
-	 */
-	private $bOutAuth;
-
-	/**
-	 * @var bool
-	 */
-	private $bOutSetSender;
-
-	/**
-	 * @var bool
-	 */
-	private $bOutUsePhpMail;
-
-	/**
-	 * @var bool
-	 */
-	private $bUseSieve;
-
-	/**
-	 * @var string
-	 */
-	private $sSieveHost;
-
-	/**
-	 * @var int
-	 */
-	private $iSievePort;
-
-	/**
-	 * @var int
-	 */
-	private $iSieveSecure;
-
-	/**
-	 * @var string
-	 */
-	private $sWhiteList;
-
-	/**
-	 * @var string
-	 */
-	private $sAliasName = '';
+	private string $aliasName = '';
 
 	function __construct(string $sName)
 	{
-		$this->sName = $sName;
+		$this->Name = $sName;
+
+		$this->IMAP = new \MailSo\Imap\Settings;
+		$this->SMTP = new \MailSo\Smtp\Settings;
+		$this->Sieve = new \MailSo\Sieve\Settings;
 	}
 
 	/**
-	 * See ToIniString() for valid values
+	 * Used by old ToIniString()
 	 */
 	public static function fromIniArray(string $sName, array $aDomain) : ?self
 	{
 		$oDomain = null;
-
-		if (\strlen($sName) && \strlen($aDomain['imap_host']) && \strlen($aDomain['imap_port']))
-		{
+		if (\strlen($sName) && \strlen($aDomain['imap_host'])) {
 			$oDomain = new self($sName);
 
-			$oDomain->sIncHost = (string) $aDomain['imap_host'];
-			$oDomain->iIncPort = (int) $aDomain['imap_port'];
-			$oDomain->iIncSecure = self::StrConnectionSecurityTypeToCons(empty($aDomain['imap_secure']) ? '' : $aDomain['imap_secure']);
-			$oDomain->bIncShortLogin = !empty($aDomain['imap_short_login']);
+			$oDomain->IMAP->host = \SnappyMail\IDN::toUtf8($aDomain['imap_host']);
+			$oDomain->IMAP->port = (int) $aDomain['imap_port'];
+			$oDomain->IMAP->type = self::StrConnectionSecurityTypeToCons($aDomain['imap_secure'] ?? '');
+			$oDomain->IMAP->shortLogin = !empty($aDomain['imap_short_login']);
 
-			$oDomain->bUseSieve = !empty($aDomain['sieve_use']);
-			$oDomain->sSieveHost = empty($aDomain['sieve_host']) ? '' : (string) $aDomain['sieve_host'];
-			$oDomain->iSievePort = empty($aDomain['sieve_port']) ? 4190 : (int) $aDomain['sieve_port'];
-			$oDomain->iSieveSecure = self::StrConnectionSecurityTypeToCons(empty($aDomain['sieve_secure']) ? '' : $aDomain['sieve_secure']);
+			$oDomain->Sieve->enabled = !empty($aDomain['sieve_use']);
+			$oDomain->Sieve->host = \SnappyMail\IDN::toUtf8($aDomain['sieve_host']);
+			$oDomain->Sieve->port = (int) ($aDomain['sieve_port'] ?? 4190);;
+			$oDomain->Sieve->type = self::StrConnectionSecurityTypeToCons($aDomain['sieve_secure'] ?? '');
 
-			$oDomain->sOutHost = empty($aDomain['smtp_host']) ? '' : (string) $aDomain['smtp_host'];
-			$oDomain->iOutPort = empty($aDomain['smtp_port']) ? 25 : (int) $aDomain['smtp_port'];
-			$oDomain->iOutSecure = self::StrConnectionSecurityTypeToCons(empty($aDomain['smtp_secure']) ? '' : $aDomain['smtp_secure']);
-			$oDomain->bOutShortLogin = !empty($aDomain['smtp_short_login']);
-			$oDomain->bOutAuth = !empty($aDomain['smtp_auth']);
-			$oDomain->bOutSetSender = !empty($aDomain['smtp_set_sender']);
-			$oDomain->bOutUsePhpMail = !empty($aDomain['smtp_php_mail']);
+			$oDomain->SMTP->host = \SnappyMail\IDN::toUtf8($aDomain['smtp_host']);
+			$oDomain->SMTP->port = (int) ($aDomain['smtp_port'] ?? 25);
+			$oDomain->SMTP->type = self::StrConnectionSecurityTypeToCons($aDomain['smtp_secure'] ?? '');
+			$oDomain->SMTP->shortLogin = !empty($aDomain['smtp_short_login']);
+			$oDomain->SMTP->useAuth = !empty($aDomain['smtp_auth']);
+			$oDomain->SMTP->setSender = !empty($aDomain['smtp_set_sender']);
+			$oDomain->SMTP->usePhpMail = !empty($aDomain['smtp_php_mail']);
 
-			$oDomain->sWhiteList = (string) ($aDomain['white_list'] ?? '');
+			$oDomain->whiteList = \trim($aDomain['white_list'] ?? '');
+
+			$oDomain->Normalize();
 		}
-
 		return $oDomain;
 	}
 
-	private function encodeIniString(string $sStr) : string
-	{
-		return str_replace('"', '\\"', $sStr);
-	}
-
 	public function Normalize()
 	{
-		$this->sIncHost = \trim($this->sIncHost);
-		$this->sSieveHost = \trim($this->sSieveHost);
-		$this->sOutHost = \trim($this->sOutHost);
-		$this->sWhiteList = \trim($this->sWhiteList);
-
-		if ($this->iIncPort <= 0)
-		{
-			$this->iIncPort = 143;
-		}
-
-		if ($this->iSievePort <= 0)
-		{
-			$this->iSievePort = 4190;
-		}
-
-		if ($this->iOutPort <= 0)
-		{
-			$this->iOutPort = 25;
-		}
-	}
-
-	public function ToIniString() : string
-	{
-		$this->Normalize();
-		return \implode("\n", array(
-			'imap_host = "'.$this->encodeIniString($this->sIncHost).'"',
-			'imap_port = '.$this->iIncPort,
-			'imap_secure = "'.self::ConstConnectionSecurityTypeToStr($this->iIncSecure).'"',
-			'imap_short_login = '.($this->bIncShortLogin ? 'On' : 'Off'),
-			'sieve_use = '.($this->bUseSieve ? 'On' : 'Off'),
-			'sieve_host = "'.$this->encodeIniString($this->sSieveHost).'"',
-			'sieve_port = '.$this->iSievePort,
-			'sieve_secure = "'.self::ConstConnectionSecurityTypeToStr($this->iSieveSecure).'"',
-			'smtp_host = "'.$this->encodeIniString($this->sOutHost).'"',
-			'smtp_port = '.$this->iOutPort,
-			'smtp_secure = "'.self::ConstConnectionSecurityTypeToStr($this->iOutSecure).'"',
-			'smtp_short_login = '.($this->bOutShortLogin ? 'On' : 'Off'),
-			'smtp_auth = '.($this->bOutAuth ? 'On' : 'Off'),
-			'smtp_set_sender = '.($this->bOutSetSender ? 'On' : 'Off'),
-			'smtp_php_mail = '.($this->bOutUsePhpMail ? 'On' : 'Off'),
-			'white_list = "'.$this->encodeIniString($this->sWhiteList).'"'
-		));
+		$this->IMAP->host = \trim($this->IMAP->host);
+		$this->Sieve->host = \trim($this->Sieve->host);
+		$this->SMTP->host = \trim($this->SMTP->host);
+		$this->whiteList = \trim($this->whiteList);
 	}
 
+	/**
+	 * Use by old fromIniArray()
+	 */
 	public static function StrConnectionSecurityTypeToCons(string $sType) : int
 	{
 		$iSecurityType = ConnectionSecurityType::NONE;
-		switch (strtoupper($sType))
+		switch (\strtoupper($sType))
 		{
 			case 'SSL':
 				$iSecurityType = ConnectionSecurityType::SSL;
@@ -202,22 +90,6 @@ class Domain implements \JsonSerializable
 		return $iSecurityType;
 	}
 
-	public static function ConstConnectionSecurityTypeToStr(int $iSecurityType) : string
-	{
-		$sType = 'None';
-		switch ($iSecurityType)
-		{
-			case ConnectionSecurityType::SSL:
-				$sType = 'SSL';
-				break;
-			case ConnectionSecurityType::STARTTLS:
-				$sType = 'TLS';
-				break;
-		}
-
-		return $sType;
-	}
-
 	/**
 	 * deprecated
 	 */
@@ -228,87 +100,89 @@ class Domain implements \JsonSerializable
 		bool $bOutAuth, bool $bOutSetSender, bool $bOutUsePhpMail,
 		string $sWhiteList = '') : self
 	{
-		$this->sIncHost = $sIncHost;
-		$this->iIncPort = $iIncPort;
-		$this->iIncSecure = $iIncSecure;
-		$this->bIncShortLogin = $bIncShortLogin;
+		$this->IMAP->host = $sIncHost;
+		$this->IMAP->port = $iIncPort;
+		$this->IMAP->type = $iIncSecure;
+		$this->IMAP->shortLogin = $bIncShortLogin;
 
-		$this->bUseSieve = $bUseSieve;
-		$this->sSieveHost = $sSieveHost;
-		$this->iSievePort = $iSievePort;
-		$this->iSieveSecure = $iSieveSecure;
+		$this->SMTP->host = $sOutHost;
+		$this->SMTP->port = $iOutPort;
+		$this->SMTP->type = $iOutSecure;
+		$this->SMTP->shortLogin = $bOutShortLogin;
+		$this->SMTP->useAuth = $bOutAuth;
+		$this->SMTP->setSender = $bOutSetSender;
+		$this->SMTP->usePhpMail = $bOutUsePhpMail;
 
-		$this->sOutHost = $sOutHost;
-		$this->iOutPort = $iOutPort;
-		$this->iOutSecure = $iOutSecure;
-		$this->bOutShortLogin = $bOutShortLogin;
-		$this->bOutAuth = $bOutAuth;
-		$this->bOutSetSender = $bOutSetSender;
-		$this->bOutUsePhpMail = $bOutUsePhpMail;
+		$this->Sieve->enabled = $bUseSieve;
+		$this->Sieve->host = $sSieveHost;
+		$this->Sieve->port = $iSievePort;
+		$this->Sieve->type = $iSieveSecure;
 
-		$this->sWhiteList = \trim($sWhiteList);
+		$this->whiteList = \trim($sWhiteList);
+
+		$this->Normalize();
 
 		return $this;
 	}
 
 	public function Name() : string
 	{
-		return $this->sName;
+		return $this->Name;
 	}
 
 	public function IncHost() : string
 	{
-		return $this->sIncHost;
+		return $this->IMAP->host;
 	}
 
 	public function IncPort() : int
 	{
-		return $this->iIncPort;
+		return $this->IMAP->port;
 	}
 
 	public function IncShortLogin() : bool
 	{
-		return $this->bIncShortLogin;
+		return $this->IMAP->shortLogin;
 	}
 
 	public function UseSieve() : bool
 	{
-		return $this->bUseSieve;
+		return $this->Sieve->enabled;
 	}
 
 	public function OutHost() : string
 	{
-		return $this->sOutHost;
+		return $this->SMTP->host;
 	}
 
 	public function OutPort() : int
 	{
-		return $this->iOutPort;
+		return $this->SMTP->port;
 	}
 
 	public function OutShortLogin() : bool
 	{
-		return $this->bOutShortLogin;
+		return $this->SMTP->shortLogin;
 	}
 
 	public function OutSetSender() : bool
 	{
-		return $this->bOutSetSender;
+		return $this->SMTP->setSender;
 	}
 
 	public function OutUsePhpMail() : bool
 	{
-		return $this->bOutUsePhpMail;
+		return $this->SMTP->usePhpMail;
 	}
 
 	public function SetAliasName(string $sAliasName) : void
 	{
-		$this->sAliasName = $sAliasName;
+		$this->aliasName = $sAliasName;
 	}
 
 	public function ValidateWhiteList(string $sEmail, string $sLogin = '') : bool
 	{
-		$sW = \trim($this->sWhiteList);
+		$sW = \trim($this->whiteList);
 		if (\strlen($sW))
 		{
 			$sEmail = \MailSo\Base\Utils::IdnToUtf8($sEmail, true);
@@ -324,39 +198,36 @@ class Domain implements \JsonSerializable
 		return true;
 	}
 
-	public function ImapSettings() : array
+	public function ImapSettings() : \MailSo\Imap\Settings
 	{
-		return array(
-			'UseConnect' => true,
-			'UseAuth' => true,
-			'Host' => $this->sIncHost,
-			'Port' => $this->iIncPort,
-			'Secure' => $this->iIncSecure,
-		);
+		return static::mergeGlobalSettings($this->IMAP);
 	}
 
-	public function SmtpSettings() : array
+	public function SmtpSettings() : \MailSo\Smtp\Settings
 	{
-		return array(
-			'UseConnect' => !$this->bOutUsePhpMail,
-			'UseAuth' => $this->bOutAuth,
-			'Host' => $this->sOutHost,
-			'Port' => $this->iOutPort,
-			'Secure' => $this->iOutSecure,
-			'Ehlo' => \MailSo\Smtp\SmtpClient::EhloHelper(),
-			'UsePhpMail' => $this->bOutUsePhpMail
-		);
+		return static::mergeGlobalSettings($this->SMTP);
 	}
 
-	public function SieveSettings() : array
+	public function SieveSettings() : \MailSo\Sieve\Settings
 	{
-		return array(
-			'UseConnect' => true,
-			'UseAuth' => true,
-			'Host' => $this->sSieveHost,
-			'Port' => $this->iSievePort,
-			'Secure' => $this->iSieveSecure
-		);
+		return static::mergeGlobalSettings($this->Sieve);
+	}
+
+	private static function mergeGlobalSettings(\MailSo\Net\ConnectSettings $oSettings) : \MailSo\Net\ConnectSettings
+	{
+		$oConfig = \RainLoop\API::Config();
+		if ($oConfig->Get('labs', 'sasl_allow_scram_sha', false)) {
+			// https://github.com/the-djmaze/snappymail/issues/182
+			\array_push($oSettings->SASLMechanisms, 'SCRAM-SHA3-512', 'SCRAM-SHA-512', 'SCRAM-SHA-256', 'SCRAM-SHA-1');
+		}
+		if ($oConfig->Get('labs', 'sasl_allow_cram_md5', false)) {
+			$oSettings->SASLMechanisms[] = 'CRAM-MD5';
+		}
+		if ($oConfig->Get('labs', 'sasl_allow_plain', true)) {
+			$oSettings->SASLMechanisms[] = 'PLAIN';
+		}
+
+		return $oSettings;
 	}
 
 	/**
@@ -364,30 +235,39 @@ class Domain implements \JsonSerializable
 	 */
 	public static function fromArray(string $sName, array $aDomain) : ?self
 	{
-		$oDomain = null;
-		if (\strlen($sName) && \strlen($aDomain['imapHost'])) {
-			$oDomain = new self($sName);
-
-			$oDomain->sIncHost = \SnappyMail\IDN::toAscii($aDomain['imapHost']);
-			$oDomain->iIncPort = (int) $aDomain['imapPort'];
-			$oDomain->iIncSecure = (int) $aDomain['imapSecure'];
-			$oDomain->bIncShortLogin = !empty($aDomain['imapShortLogin']);
-
-			$oDomain->bUseSieve = !empty($aDomain['useSieve']);
-			$oDomain->sSieveHost = \SnappyMail\IDN::toAscii($aDomain['sieveHost']);
-			$oDomain->iSievePort = (int) $aDomain['sievePort'];
-			$oDomain->iSieveSecure = (int) $aDomain['sieveSecure'];
-
-			$oDomain->sOutHost = \SnappyMail\IDN::toAscii($aDomain['smtpHost']);
-			$oDomain->iOutPort = (int) $aDomain['smtpPort'];
-			$oDomain->iOutSecure = (int) $aDomain['smtpSecure'];
-			$oDomain->bOutShortLogin = !empty($aDomain['smtpShortLogin']);
-			$oDomain->bOutAuth = !empty($aDomain['smtpAuth']);
-			$oDomain->bOutSetSender = !empty($aDomain['smtpSetSender']);
-			$oDomain->bOutUsePhpMail = !empty($aDomain['smtpPhpMail']);
-
-			$oDomain->sWhiteList = (string) $aDomain['whiteList'];
+		if (!\strlen($sName)) {
+			return null;
 		}
+		$oDomain = new self($sName);
+		if (!empty($aDomain['IMAP'])) {
+			$oDomain->IMAP = \MailSo\Imap\Settings::fromArray($aDomain['IMAP']);
+			$oDomain->SMTP = \MailSo\Smtp\Settings::fromArray($aDomain['SMTP']);
+			$oDomain->Sieve = \MailSo\Sieve\Settings::fromArray($aDomain['Sieve']);
+			$oDomain->whiteList = (string) $aDomain['whiteList'];
+		} else if (\strlen($aDomain['imapHost'])) {
+			$oDomain->IMAP->host = $aDomain['imapHost'];
+			$oDomain->IMAP->port = (int) $aDomain['imapPort'];
+			$oDomain->IMAP->type = (int) $aDomain['imapSecure'];
+			$oDomain->IMAP->shortLogin = !empty($aDomain['imapShortLogin']);
+
+			$oDomain->Sieve->enabled = !empty($aDomain['useSieve']);
+			$oDomain->Sieve->host = $aDomain['sieveHost'];
+			$oDomain->Sieve->port = (int) $aDomain['sievePort'];
+			$oDomain->Sieve->type = (int) $aDomain['sieveSecure'];
+
+			$oDomain->SMTP->host = $aDomain['smtpHost'];
+			$oDomain->SMTP->port = (int) $aDomain['smtpPort'];
+			$oDomain->SMTP->type = (int) $aDomain['smtpSecure'];
+			$oDomain->SMTP->shortLogin = !empty($aDomain['smtpShortLogin']);
+			$oDomain->SMTP->useAuth = !empty($aDomain['smtpAuth']);
+			$oDomain->SMTP->setSender = !empty($aDomain['smtpSetSender']);
+			$oDomain->SMTP->usePhpMail = !empty($aDomain['smtpPhpMail']);
+
+			$oDomain->whiteList = (string) $aDomain['whiteList'];
+		} else {
+			return null;
+		}
+		$oDomain->Normalize();
 		return $oDomain;
 	}
 
@@ -396,26 +276,14 @@ class Domain implements \JsonSerializable
 	{
 		$aResult = array(
 //			'@Object' => 'Object/Domain',
-			'name' => \SnappyMail\IDN::toUtf8($this->sName),
-			'imapHost' => \SnappyMail\IDN::toUtf8($this->sIncHost),
-			'imapPort' => $this->iIncPort,
-			'imapSecure' => $this->iIncSecure,
-			'imapShortLogin' => $this->bIncShortLogin,
-			'useSieve' => $this->bUseSieve,
-			'sieveHost' => \SnappyMail\IDN::toUtf8($this->sSieveHost),
-			'sievePort' => $this->iSievePort,
-			'sieveSecure' => $this->iSieveSecure,
-			'smtpHost' => \SnappyMail\IDN::toUtf8($this->sOutHost),
-			'smtpPort' => $this->iOutPort,
-			'smtpSecure' => $this->iOutSecure,
-			'smtpShortLogin' => $this->bOutShortLogin,
-			'smtpAuth' => $this->bOutAuth,
-			'smtpSetSender' => $this->bOutSetSender,
-			'smtpPhpMail' => $this->bOutUsePhpMail,
-			'whiteList' => $this->sWhiteList
+			'name' => $this->Name,
+			'IMAP' => $this->IMAP,
+			'SMTP' => $this->SMTP,
+			'Sieve' => $this->Sieve,
+			'whiteList' => $this->whiteList
 		);
-		if ($this->sAliasName) {
-			$aResult['aliasName'] = $this->sAliasName;
+		if ($this->aliasName) {
+			$aResult['aliasName'] = $this->aliasName;
 		}
 		return $aResult;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
index 9dc10e72c..37bcbe7c5 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
@@ -41,15 +41,11 @@ class Manager
 			if (\strlen($sList)) {
 				$aList = \SnappyMail\Repository::getEnabledPackagesNames();
 				foreach ($aList as $i => $sName) {
-					$oPlugin = $this->CreatePluginByName($sName);
-					if ($oPlugin) {
-						$oPlugin->Init();
-						$this->aPlugins[] = $oPlugin;
-					} else {
+					if (!$this->loadPlugin($sName)) {
 						unset($aList[$i]);
 					}
 				}
-				$aList = \implode(',', \array_unique($aList));
+				$aList = \implode(',', \array_keys($this->aPlugins));
 				if ($sList != $aList) {
 					$oConfig->Set('plugins', 'enabled_list', $aList);
 					$oConfig->Save();
@@ -58,6 +54,18 @@ class Manager
 		}
 	}
 
+	public function loadPlugin(string $sName) : bool
+	{
+		if (!isset($this->aPlugins[$sName])) {
+			$oPlugin = $this->CreatePluginByName($sName);
+			if ($oPlugin) {
+				$oPlugin->Init();
+				$this->aPlugins[$sName] = $oPlugin;
+			}
+		}
+		return isset($this->aPlugins[$sName]);
+	}
+
 	protected static function getPluginPath(string $sName) : ?string
 	{
 		$sPath = APP_PLUGINS_PATH.$sName;
@@ -360,11 +368,7 @@ class Manager
 			{
 				foreach ($this->aAdditionalParts[$sActionName] as $mCallbak)
 				{
-					$bCallResult = $mCallbak(...$aParts);
-					if ($bCallResult && !$bResult)
-					{
-						$bResult = true;
-					}
+					$bResult = !!$mCallbak(...$aParts) || $bResult;
 				}
 			}
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
index d9f0fd987..6136e07c5 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
@@ -60,6 +60,11 @@ class AddressBook extends AbstractProvider
 		) : array();
 	}
 
+	public function GetContactByEmail(string $sEmail) : ?AddressBook\Classes\Contact
+	{
+		return $this->IsActive() ? $this->oDriver->GetContactByEmail($sEmail) : null;
+	}
+
 	public function GetContactByID($mID, bool $bIsStrID = false) : ?AddressBook\Classes\Contact
 	{
 		return $this->IsActive() ? $this->oDriver->GetContactByID($mID, $bIsStrID) : null;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/AddressBookInterface.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/AddressBookInterface.php
index d0ce8ef54..564a0d48b 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/AddressBookInterface.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/AddressBookInterface.php
@@ -20,6 +20,8 @@ interface AddressBookInterface
 
 	public function GetContacts(int $iOffset = 0, int $iLimit = 20, string $sSearch = '', int &$iResultCount = 0) : array;
 
+	public function GetContactByEmail(string $sEmail) : ?Classes\Contact;
+
 	public function GetContactByID($mID, bool $bIsStrID = false) : ?Classes\Contact;
 
 	public function GetSuggestions(string $sSearch, int $iLimit = 20) : array;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
index 453e02026..1ca58b5c1 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
@@ -28,15 +28,11 @@ trait CardDAV
 		$aResponse = null;
 		try
 		{
-			$this->oLogger->Write('PROPFIND '.$sPath, \LOG_INFO, 'DAV');
-
 			$aResponse = $oClient->propFind($sPath, array(
 				'{DAV:}getlastmodified',
 				'{DAV:}resourcetype',
 				'{DAV:}getetag'
 			), 1);
-
-//			$this->oLogger->WriteDump($aResponse);
 		}
 		catch (\Throwable $oException)
 		{
@@ -139,16 +135,12 @@ trait CardDAV
 
 		try
 		{
-			$this->oLogger->Write('PROPFIND '.$sPath, \LOG_INFO, 'DAV');
-
 			$aResponse = $oClient->propFind($sPath, array(
 				'{DAV:}current-user-principal',
 				'{DAV:}resourcetype',
 				'{DAV:}displayname',
 				'{urn:ietf:params:xml:ns:carddav}addressbook-home-set'
 			), 1);
-
-//			$this->oLogger->WriteDump($aResponse);
 		}
 		catch (\Throwable $oException)
 		{
@@ -158,49 +150,47 @@ trait CardDAV
 		return $aResponse;
 	}
 
-	private function getContactsPaths(DAVClient $oClient, string $sUser, string $sPassword, string $sProxy = '') : array
+	private function getContactsPaths(DAVClient $oClient, string $sPath, string $sUser, string $sPassword, string $sProxy = '') : array
 	{
 		$aContactsPaths = array();
 
 		$sCurrentUserPrincipal = '';
 		$sAddressbookHomeSet = '';
 
-//		[{DAV:}current-user-principal] => /cloud/remote.php/carddav/principals/admin/
-//		[{urn:ietf:params:xml:ns:carddav}addressbook-home-set] => /cloud/remote.php/carddav/addressbooks/admin/
-
-		$aResponse = $this->detectionPropFind($oClient, '/.well-known/carddav');
+		$aResponse = $this->detectionPropFind($oClient, '/.well-known/carddav')
+			?: $this->detectionPropFind($oClient, $sPath);
 
 		$sNextPath = '';
 		$sFirstNextPath = '';
 		if (\is_array($aResponse))
 		{
-			foreach ($aResponse as $sKey => $aItem)
+			foreach ($aResponse as $sPropPath => $aItem)
 			{
-				if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']) &&
-					false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'], '/calendar-proxy'))
+				if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'])
+				 && false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'], '/calendar-proxy'))
 				{
-					$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'];
+					$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'];
 					continue;
 				}
 
-				if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']))
+				if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']['{DAV:}href']))
 				{
-					$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal'];
+					$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal']['{DAV:}href'];
 					continue;
 				}
 
-				if (!empty($sKey))
+				if (!empty($sPropPath))
 				{
 					if (empty($sFirstNextPath))
 					{
-						$sFirstNextPath = $sKey;
+						$sFirstNextPath = $sPropPath;
 					}
 
 					if (empty($sNextPath))
 					{
 						if (static::hasDAVCollection($aItem))
 						{
-							$sNextPath = $sKey;
+							$sNextPath = $sPropPath;
 							continue;
 						}
 					}
@@ -219,36 +209,32 @@ trait CardDAV
 			{
 				return $aContactsPaths;
 			}
-			else
+			if (\preg_match('/^http[s]?:\/\//i', $sNextPath))
 			{
-				if (\preg_match('/^http[s]?:\/\//i', $sNextPath))
+				$oClient = $this->getDavClientFromUrl($sNextPath, $sUser, $sPassword, $sProxy);
+				if (!$oClient)
 				{
-					$oClient = $this->getDavClientFromUrl($sNextPath, $sUser, $sPassword, $sProxy);
-					if ($oClient)
-					{
-						$sNextPath = $oClient->__UrlPath__;
-					}
-					else
-					{
-						return $aContactsPaths;
-					}
+					return $aContactsPaths;
 				}
+				$sNextPath = $oClient->__UrlPath__;
+			}
 
+			if ($sPath != $sNextPath) {
 				$aResponse = $this->detectionPropFind($oClient, $sNextPath);
 				if (\is_array($aResponse))
 				{
-					foreach ($aResponse as $sKey => $aItem)
+					foreach ($aResponse as $aItem)
 					{
-						if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']) &&
-							false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'], '/calendar-proxy'))
+						if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href']) &&
+							false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'], '/calendar-proxy'))
 						{
-							$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'];
+							$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'];
 							continue;
 						}
 
-						if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']))
+						if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']['{DAV:}href']))
 						{
-							$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal'];
+							$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal']['{DAV:}href'];
 							continue;
 						}
 					}
@@ -262,32 +248,29 @@ trait CardDAV
 			{
 				return $aContactsPaths;
 			}
-			else
+			if (\preg_match('/^http[s]?:\/\//i', $sCurrentUserPrincipal))
 			{
-				if (\preg_match('/^http[s]?:\/\//i', $sCurrentUserPrincipal))
+				$oClient = $this->getDavClientFromUrl($sCurrentUserPrincipal, $sUser, $sPassword, $sProxy);
+				if ($oClient)
 				{
-					$oClient = $this->getDavClientFromUrl($sCurrentUserPrincipal, $sUser, $sPassword, $sProxy);
-					if ($oClient)
-					{
-						$sCurrentUserPrincipal = $oClient->__UrlPath__;
-					}
-					else
-					{
-						return $aContactsPaths;
-					}
+					$sCurrentUserPrincipal = $oClient->__UrlPath__;
 				}
-
-				$aResponse = $this->detectionPropFind($oClient, $sCurrentUserPrincipal);
-				if (\is_array($aResponse))
+				else
 				{
-					foreach ($aResponse as $sKey => $aItem)
+					return $aContactsPaths;
+				}
+			}
+
+			$aResponse = $this->detectionPropFind($oClient, $sCurrentUserPrincipal);
+			if (\is_array($aResponse))
+			{
+				foreach ($aResponse as $aItem)
+				{
+					if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href']) &&
+						false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'], '/calendar-proxy'))
 					{
-						if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']) &&
-							false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'], '/calendar-proxy'))
-						{
-							$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'];
-							continue;
-						}
+						$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'];
+						continue;
 					}
 				}
 			}
@@ -297,31 +280,28 @@ trait CardDAV
 		{
 			return $aContactsPaths;
 		}
-		else
+		if (\preg_match('/^http[s]?:\/\//i', $sAddressbookHomeSet))
 		{
-			if (\preg_match('/^http[s]?:\/\//i', $sAddressbookHomeSet))
+			$oClient = $this->getDavClientFromUrl($sAddressbookHomeSet, $sUser, $sPassword, $sProxy);
+			if ($oClient)
 			{
-				$oClient = $this->getDavClientFromUrl($sAddressbookHomeSet, $sUser, $sPassword, $sProxy);
-				if ($oClient)
-				{
-					$sAddressbookHomeSet = $oClient->__UrlPath__;
-				}
-				else
-				{
-					return $aContactsPaths;
-				}
+				$sAddressbookHomeSet = $oClient->__UrlPath__;
 			}
-
-			$aResponse = $this->detectionPropFind($oClient, $sAddressbookHomeSet);
-			if (\is_array($aResponse))
+			else
 			{
-				foreach ($aResponse as $sKey => $aItem)
+				return $aContactsPaths;
+			}
+		}
+
+		$aResponse = $this->detectionPropFind($oClient, $sAddressbookHomeSet);
+		if (\is_array($aResponse))
+		{
+			foreach ($aResponse as $sPropPath => $aItem)
+			{
+				if (!empty($sPropPath) && static::hasDAVCollection($aItem)
+				 && \in_array('{urn:ietf:params:xml:ns:carddav}addressbook', $aItem['{DAV:}resourcetype']))
 				{
-					if (!empty($sKey) && static::hasDAVCollection($aItem)
-					 && \in_array('{urn:ietf:params:xml:ns:carddav}addressbook', $aItem['{DAV:}resourcetype']))
-					{
-						$aContactsPaths[$sKey] = isset($aItem['{DAV:}displayname']) ? \trim($aItem['{DAV:}displayname']) : '';
-					}
+					$aContactsPaths[$sPropPath] = isset($aItem['{DAV:}displayname']) ? \trim($aItem['{DAV:}displayname']) : '';
 				}
 			}
 		}
@@ -329,6 +309,9 @@ trait CardDAV
 		return $aContactsPaths;
 	}
 
+	/**
+	 * Checks if remote path resourcetype is an addressbook
+	 */
 	private function checkContactsPath(DAVClient $oClient, string $sPath) : bool
 	{
 		if (!$oClient)
@@ -336,16 +319,12 @@ trait CardDAV
 			return false;
 		}
 
-		$this->oLogger->Write('PROPFIND '.$sPath, \LOG_INFO, 'DAV');
-
 		$aResponse = null;
 		try
 		{
 			$aResponse = $oClient->propFind($sPath, array(
 				'{DAV:}resourcetype'
 			), 1);
-
-//			$this->oLogger->WriteDump($aResponse);
 		}
 		catch (\Throwable $oException)
 		{
@@ -445,11 +424,13 @@ trait CardDAV
 		$bGood = true;
 		if ('' === $sPath || '/' === $sPath || !$this->checkContactsPath($oClient, $sPath))
 		{
-			$sNewPath = '';
-
-			$aPaths = $this->getContactsPaths($oClient, $sUser, $sPassword, $sProxy);
+			/**
+			 * Path is not an addressbook, try to find it
+			 */
+			$aPaths = $this->getContactsPaths($oClient, $sPath, $sUser, $sPassword, $sProxy);
 			$this->oLogger->WriteDump($aPaths);
 
+			$sNewPath = '';
 			if (\is_array($aPaths))
 			{
 				if (1 < \count($aPaths))
@@ -493,7 +474,7 @@ trait CardDAV
 
 			$sPath = $sNewPath;
 
-			$bGood = $this->checkContactsPath($oClient, $sPath);
+			$bGood = $sPath && $this->checkContactsPath($oClient, $sPath);
 		}
 
 		return $bGood ? $oClient : null;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
index 316764420..9b8fd15bf 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
@@ -2,43 +2,26 @@
 
 namespace RainLoop\Providers\AddressBook\Classes;
 
+use \Sabre\VObject\Component\VCard;
+
 class Contact implements \JsonSerializable
 {
-	/**
-	 * @var string
-	 */
-	public $id = '';
+	public string $id = '';
+
+	public string $IdContactStr = '';
+
+//	public string $Display;
+
+	public int $Changed;
+
+	public bool $ReadOnly = false;
 
 	/**
-	 * @var string
-	 */
-	public $IdContactStr = '';
-
-	/**
-	 * @var string
-	 */
-//	public $Display;
-
-	/**
-	 * @var int
-	 */
-	public $Changed;
-
-	/**
-	 * @var bool
-	 */
-	public $ReadOnly = false;
-
-	/**
-	 * @var string
 	 * Used for CardDAV synchronization
 	 */
-	public $Etag = '';
+	public string $Etag = '';
 
-	/**
-	 * @var \Sabre\VObject\Component\VCard
-	 */
-	protected $vCard = null;
+	protected ?VCard $vCard = null;
 
 	function __construct()
 	{
@@ -62,8 +45,15 @@ class Contact implements \JsonSerializable
 		return \array_unique($aResult);
 	}
 */
-	public function setVCard(\Sabre\VObject\Component\VCard $oVCard) : void
+	public function setVCard(VCard $oVCard) : void
 	{
+		if ($oVCard->PHOTO && $oVCard->PHOTO->parameters['ENCODING']) {
+			$oVCard->VERSION = '3.0';
+		}
+		if (VCard::VCARD40 != $oVCard->getDocumentType()) {
+			$oVCard = $oVCard->convert(VCard::VCARD40);
+		}
+
 		// KDE KAddressBook entry and used by SnappyMail
 		// https://github.com/sabre-io/vobject/issues/589
 		$oVCard->select('X-CRYPTO')
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
index 9a37ee8b2..f7bbf15d4 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
@@ -531,12 +531,16 @@ class PdoAddressBook
 										$sUid = $sFirstName = $sLastName = $sMiddleName = $sSuffix = $sPrefix = '';
 										$iPrevId = $iId;
 									}
-									if (!isset($aVCards[$iId])) {
-										$aVCards[$iId] = new VCard;
+									if (isset($aVCards[$iId])) {
+										$oVCard = $aVCards[$iId];
+									} else {
+										$oVCard = new VCard;
+//										$oVCard = $oVCard->convert(VCard::VCARD40);
+										$oVCard->VERSION = '4.0';
+										$oVCard->PRODID = 'SnappyMail-'.APP_VERSION;
+										$aVCards[$iId] = $oVCard;
 									}
 									$oVCard = $aVCards[$iId];
-									$oVCard->VERSION = '4.0';
-									$oVCard->PRODID = 'SnappyMail-'.APP_VERSION;
 									$sPropValue = (string) $aItem['prop_value'];
 									$aTypes = array();
 									if (!empty($aItem['prop_type_str'])) {
@@ -690,6 +694,40 @@ class PdoAddressBook
 		return [];
 	}
 
+	/**
+	 * @param mixed $mID
+	 */
+	public function GetContactByEmail(string $sEmail) : ?Contact
+	{
+		$sLowerSearch = $this->specialConvertSearchValueLower($sEmail);
+
+		$sSql = 'SELECT
+			DISTINCT id_contact
+		FROM rainloop_ab_properties
+		WHERE id_user = :id_user
+		 AND prop_type = '.PropertyType::JCARD.'
+		 AND ('.
+			'prop_value LIKE :search ESCAPE \'=\''
+				. (\strlen($sLowerSearch) ? ' OR (prop_value_lower <> \'\' AND prop_value_lower LIKE :search_lower ESCAPE \'=\')' : '').
+			')';
+		$aParams = array(
+			':id_user' => array($this->iUserID, \PDO::PARAM_INT),
+			':search' => array($this->specialConvertSearchValue($sEmail, '='), \PDO::PARAM_STR)
+		);
+		if (\strlen($sLowerSearch)) {
+			$aParams[':search_lower'] = array($sLowerSearch, \PDO::PARAM_STR);
+		}
+
+		$oContact = null;
+		$iIdContact = 0;
+
+		$aContacts = $this->getContactsFromPDO(
+			$this->prepareAndExecute($sSql, $aParams)
+		);
+
+		return $aContacts ? $aContacts[0] : null;
+	}
+
 	/**
 	 * @param mixed $mID
 	 */
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php
index 5fcbf11ca..0f7b8abe8 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php
@@ -57,7 +57,7 @@ class Domain extends AbstractProvider
 
 	public function LoadOrCreateNewFromAction(\RainLoop\Actions $oActions, string $sNameForTest = null) : ?\RainLoop\Model\Domain
 	{
-		$sName = (string) $oActions->GetActionParam('Name', '');
+		$sName = \mb_strtolower((string) $oActions->GetActionParam('Name', ''));
 		if (\strlen($sName) && $sNameForTest && !\str_contains($sName, '*')) {
 			$sNameForTest = null;
 		}
@@ -66,22 +66,10 @@ class Domain extends AbstractProvider
 				throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DomainAlreadyExists);
 			}
 			return \RainLoop\Model\Domain::fromArray($sNameForTest ?: $sName, [
-				'imapHost' => $oActions->GetActionParam('IncHost', ''),
-				'imapPort' => $oActions->GetActionParam('IncPort', 143),
-				'imapSecure' => $oActions->GetActionParam('IncSecure', \MailSo\Net\Enumerations\ConnectionSecurityType::NONE),
-				'imapShortLogin' => $oActions->GetActionParam('IncShortLogin', 0),
-				'useSieve' => $oActions->GetActionParam('UseSieve', 0),
-				'sieveHost' => $oActions->GetActionParam('SieveHost', ''),
-				'sievePort' => $oActions->GetActionParam('SievePort', 4190),
-				'sieveSecure' => $oActions->GetActionParam('SieveSecure', \MailSo\Net\Enumerations\ConnectionSecurityType::NONE),
-				'smtpHost' => $oActions->GetActionParam('OutHost', ''),
-				'smtpPort' => $oActions->GetActionParam('OutPort', 25),
-				'smtpSecure' => $oActions->GetActionParam('OutSecure', \MailSo\Net\Enumerations\ConnectionSecurityType::NONE),
-				'smtpShortLogin' => $oActions->GetActionParam('OutShortLogin', 0),
-				'smtpAuth' => $oActions->GetActionParam('OutAuth', 1),
-				'smtpSetSender' => $oActions->GetActionParam('OutSetSender', 0),
-				'smtpPhpMail' => $oActions->GetActionParam('OutUsePhpMail', 0),
-				'whiteList' => $oActions->GetActionParam('WhiteList', '')
+				'IMAP' => $oActions->GetActionParam('IMAP'),
+				'SMTP' => $oActions->GetActionParam('SMTP'),
+				'Sieve' => $oActions->GetActionParam('Sieve'),
+				'whiteList' => $oActions->GetActionParam('whiteList')
 			]);
 		}
 		return null;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
index b01d34b2c..7500739e3 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
@@ -135,7 +135,6 @@ class DefaultDomain implements DomainInterface
 			$this->oCacher->Delete(static::wildcardDomainsCacheKey());
 		}
 
-//		\RainLoop\Utils::saveFile($this->sDomainPath.'/'.$sRealFileName.'.ini', $oDomain->ToIniString());
 		\RainLoop\Utils::saveFile($this->sDomainPath.'/'.$sRealFileName.'.json', \json_encode($oDomain, \JSON_PRETTY_PRINT));
 
 		return true;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
index 4b4bc5f2f..f85e15b33 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
@@ -29,9 +29,9 @@ class SieveStorage implements FiltersInterface
 		$this->oConfig = $oConfig;
 	}
 
-	protected function getConnection(\RainLoop\Model\Account $oAccount) : ?\MailSo\Sieve\ManageSieveClient
+	protected function getConnection(\RainLoop\Model\Account $oAccount) : ?\MailSo\Sieve\SieveClient
 	{
-		$oSieveClient = new \MailSo\Sieve\ManageSieveClient();
+		$oSieveClient = new \MailSo\Sieve\SieveClient();
 		$oSieveClient->SetLogger($this->oLogger);
 		$oSieveClient->SetTimeOuts(10, (int) \RainLoop\Api::Config()->Get('labs', 'sieve_timeout', 10));
 		return $oAccount->SieveConnectAndLoginHelper($this->oPlugins, $oSieveClient, $this->oConfig)
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
index 6875624fe..602741f00 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -154,12 +154,13 @@ abstract class Service
 
 			$sLanguage = $oActions->GetLanguage($bAdmin);
 
-			$sAppJsMin = $oConfig->Get('labs', 'use_app_debug_js', false) ? '' : '.min';
-			$sAppCssMin = $oConfig->Get('labs', 'use_app_debug_css', false) ? '' : '.min';
+			$bAppDebug = $oConfig->Get('debug', 'enable', false);
+			$sAppJsMin = $bAppDebug || $oConfig->Get('labs', 'use_app_debug_js', false) ? '' : '.min';
+			$sAppCssMin = $bAppDebug || $oConfig->Get('labs', 'use_app_debug_css', false) ? '' : '.min';
 
 			$sFaviconUrl = (string) $oConfig->Get('webmail', 'favicon_url', '');
 
-			$sFaviconPngLink = $sFaviconUrl ? $sFaviconUrl : Utils::WebStaticPath('apple-touch-icon.png');
+			$sFaviconPngLink = $sFaviconUrl ?: Utils::WebStaticPath('apple-touch-icon.png');
 			$sAppleTouchLink = $sFaviconUrl ? '' : Utils::WebStaticPath('apple-touch-icon.png');
 
 			$aTemplateParameters = array(
@@ -168,7 +169,7 @@ abstract class Service
 				'{{BaseAppMainCssLink}}' => Utils::WebStaticPath('css/'.($bAdmin ? 'admin' : 'app').$sAppCssMin.'.css'),
 				'{{BaseAppThemeCssLink}}' => $oActions->ThemeLink($bAdmin),
 				'{{BaseAppManifestLink}}' => Utils::WebStaticPath('manifest.json'),
-				'{{BaseFavIconSvg}}' => Utils::WebStaticPath('favicon.svg'),
+				'{{BaseFavIconSvg}}' => $sFaviconUrl ? '' : Utils::WebStaticPath('favicon.svg'),
 				'{{LoadingDescriptionEsc}}' => \htmlspecialchars($oConfig->Get('webmail', 'loading_description', 'SnappyMail'), ENT_QUOTES|ENT_IGNORE, 'UTF-8'),
 				'{{BaseAppAdmin}}' => $bAdmin ? 1 : 0
 			);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index e62372347..4717c29dc 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -734,109 +734,6 @@ class ServiceActions
 		return '';
 	}
 
-	public function ServiceRemoteAutoLogin() : string
-	{
-		$oException = null;
-		$oAccount = null;
-
-		$sEmail = $_ENV['REMOTE_USER'] ?? '';
-		$sPassword = $_ENV['REMOTE_PASSWORD'] ?? '';
-
-		if (\strlen($sEmail) && \strlen(\trim($sPassword)))
-		{
-			try
-			{
-				$oAccount = $this->oActions->LoginProcess($sEmail, $sPassword);
-				if ($oAccount instanceof Model\MainAccount) {
-					$this->oActions->SetAuthToken($oAccount);
-				}
-			}
-			catch (\Throwable $oException)
-			{
-				$this->Logger()->WriteException($oException);
-			}
-		}
-
-		$this->oActions->Location('./');
-		return '';
-	}
-
-	public function ServiceExternalLogin() : string
-	{
-		$this->oHttp->ServerNoCache();
-
-		$oException = null;
-		$oAccount = null;
-
-		if ($this->oActions->Config()->Get('labs', 'allow_external_login', false)) {
-			$sEmail = \trim($_POST['Email']);
-			$sPassword = $_POST['Password'];
-
-			try
-			{
-				$oAccount = $this->oActions->LoginProcess($sEmail, $sPassword);
-				if ($oAccount instanceof Model\MainAccount) {
-					$this->oActions->SetAuthToken($oAccount);
-				} else {
-					$oAccount = null;
-				}
-			}
-			catch (\Throwable $oException)
-			{
-				$this->Logger()->WriteException($oException);
-			}
-		}
-
-		if ('json' === \strtolower($_POST['Output'])) {
-			\header('Content-Type: application/json; charset=utf-8');
-
-			$aResult = array(
-				'Action' => 'ExternalLogin',
-				'Result' => $oAccount ? true : false,
-				'ErrorCode' => 0
-			);
-
-			if (!$oAccount) {
-				if ($oException instanceof Exceptions\ClientException) {
-					$aResult['ErrorCode'] = $oException->getCode();
-				} else {
-					$aResult['ErrorCode'] = Notifications::AuthError;
-				}
-			}
-
-			return Utils::jsonEncode($aResult);
-		}
-
-		$this->oActions->Location('./');
-		return '';
-	}
-
-	public function ServiceExternalSso() : string
-	{
-		$this->oHttp->ServerNoCache();
-		$sResult = '';
-		$oConfig = $this->oActions->Config();
-		$sKey = $oConfig->Get('labs', 'external_sso_key', '');
-		$sEmail = \trim($_POST['Email']);
-		$sPassword = $_POST['Password'];
-		if ($oConfig->Get('labs', 'allow_external_sso', false)
-		 && $sEmail && $sPassword
-		 && $sKey && $_POST['SsoKey'] == $sKey
-		) {
-			$sResult = \RainLoop\Api::CreateUserSsoHash($sEmail, $sPassword);
-			if ('json' == \strtolower($_POST['Output'] ?? 'Plain')) {
-				\header('Content-Type: application/json; charset=utf-8');
-				$sResult = \json_encode(array(
-					'Action' => 'ExternalSso',
-					'Result' => $sResult
-				));
-			} else {
-				\header('Content-Type: text/plain');
-			}
-		}
-		return $sResult;
-	}
-
 	public function ErrorTemplates(string $sTitle, string $sDesc, bool $bShowBackLink = true) : string
 	{
 		return \strtr(\file_get_contents(APP_VERSION_ROOT_PATH.'app/templates/Error.html'), array(
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
index 9aade3928..c8c58a635 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
@@ -30,9 +30,11 @@ class Utils
 	public static function jsonEncode($value, int $flags = \JSON_INVALID_UTF8_SUBSTITUTE) : string
 	{
 		try {
+			/* Issue with \SnappyMail\HTTP\Stream
 			if (Api::Config()->Get('debug', 'enable', false)) {
 				$flags |= \JSON_PRETTY_PRINT;
 			}
+			*/
 			return \json_encode($value, $flags | \JSON_UNESCAPED_UNICODE | \JSON_THROW_ON_ERROR);
 		} catch (\Throwable $e) {
 			Api::Logger()->WriteException($e, \LOG_ERR, 'JSON');
@@ -233,7 +235,12 @@ class Utils
 
 	public static function WebVersionPath() : string
 	{
-		return self::WebPath() . \str_replace(APP_INDEX_ROOT_PATH, '', APP_VERSION_ROOT_PATH);
+		return self::WebPath() . 'snappymail/v/' . APP_VERSION . '/';
+		/**
+		 * TODO: solve this to support other paths.
+		 * https://github.com/the-djmaze/snappymail/issues/685
+		 */
+//		return self::WebPath() . \str_replace(APP_INDEX_ROOT_PATH, '', APP_VERSION_ROOT_PATH);
 	}
 
 	public static function WebStaticPath(string $path = '') : string
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
index 44857b46e..d49b51454 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
@@ -18,7 +18,6 @@ abstract class Crypt
 			$list = \array_diff($list, \array_map('strtoupper',$list));
 			$list = \array_filter($list, function($v){
 				// DES/ECB/bf/rc insecure, GCM/CCM not supported
-				// AEAD
 				return !\preg_match('/(^(des|bf|rc))|-(ecb|gcm|ccm|ocb|siv|cts)|wrap/i', $v);
 			});
 			\natcasesort($list);
@@ -37,6 +36,7 @@ abstract class Crypt
 			static::$cipher = $cipher;
 			return true;
 		}
+		Log::error('Crypt', "OpenSSL no support for cipher '{$cipher}'");
 		return false;
 	}
 
@@ -95,18 +95,22 @@ abstract class Crypt
 	{
 		$data = \json_encode($data);
 
-		try {
-			$nonce = \random_bytes(\SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES);
-			return ['sodium', $nonce, static::SodiumEncrypt($data, $nonce, $key)];
-		} catch (\Throwable $e) {
-			Log::error($e->getMessage());
+		if (\is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt')) {
+			try {
+				$nonce = \random_bytes(\SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES);
+				return ['sodium', $nonce, static::SodiumEncrypt($data, $nonce, $key)];
+			} catch (\Throwable $e) {
+				Log::error('Crypt', 'Sodium ' . $e->getMessage());
+			}
 		}
 
-		try {
-			$iv = \random_bytes(\openssl_cipher_iv_length(static::$cipher));
-			return ['openssl', $iv, static::OpenSSLEncrypt($data, $iv, $key)];
-		} catch (\Throwable $e) {
-			Log::error($e->getMessage());
+		if (\is_callable('openssl_encrypt')) {
+			try {
+				$iv = \random_bytes(\openssl_cipher_iv_length(static::$cipher));
+				return ['openssl', $iv, static::OpenSSLEncrypt($data, $iv, $key)];
+			} catch (\Throwable $e) {
+				Log::error('Crypt', 'OpenSSL ' . $e->getMessage());
+			}
 		}
 
 		$salt = \random_bytes(16);
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php b/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php
index b2b62b25d..7e19a4510 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php
@@ -38,10 +38,14 @@ class Client
 
 		$this->HTTP = \SnappyMail\HTTP\Request::factory(/*'socket'*/);
 		$this->HTTP->proxy = $settings['proxy'] ?? null;
-		$this->HTTP->setAuth(3, $settings['userName'] ?? '', $settings['password'] ?? '');
+		if (!empty($settings['userName']) && !empty($settings['password'])) {
+			$this->HTTP->setAuth(3, $settings['userName'], $settings['password']);
+		} else {
+			\SnappyMail\Log::warning('DAV', 'No user credentials set');
+		}
 		$this->HTTP->max_response_kb = 0;
 		$this->HTTP->timeout = 15; // timeout in seconds.
-//		$this->HTTP->max_redirects = 0;
+		$this->HTTP->max_redirects = 0;
 	}
 
 	/**
@@ -69,11 +73,12 @@ class Client
 				$url = $this->baseUri . $url;
 			}
 		}
+		\SnappyMail\Log::debug('DAV', "{$method} {$url}" . ($body ? "\n\t" . \str_replace("\n", "\n\t", $body) : ''));
 		$response = $this->HTTP->doRequest($method, $url, $body, $headers);
 		if (301 == $response->status) {
 			// Like: RewriteRule ^\.well-known/carddav /nextcloud/remote.php/dav [R=301,L]
 			$location = $response->getRedirectLocation();
-			\trigger_error("Redirect {$url} to {$location}");
+			\SnappyMail\Log::info('DAV', "301 Redirect {$url} to {$location}");
 			$url = \preg_replace('@^(https?:)?//[^/]+[/$]@', '/', $location);
 			$parts = \parse_url($this->baseUri);
 			$url = $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port'])?':' . $parts['port']:'') . $url;
@@ -82,6 +87,7 @@ class Client
 		if (300 <= $response->status) {
 			throw new \SnappyMail\HTTP\Exception("{$method} {$url}", $response->status, $response);
 		}
+		\SnappyMail\Log::debug('DAV', "{$response->status}: {$response->body}");
 
 		return $response;
 	}
@@ -104,23 +110,20 @@ class Client
 	 */
 	public function propFind(string $url, array $properties, int $depth = 0) : array
 	{
-		$body = '<?xml version="1.0"?>' . "\n";
-		$body.= '<d:propfind xmlns:d="DAV:">' . "\n";
-		$body.= '  <d:prop>' . "\n";
+		$body = '<?xml version="1.0"?>' . "\n" . '<d:propfind xmlns:d="DAV:"><d:prop>';
 
 		foreach ($properties as $property) {
 			if (!\preg_match('/^{([^}]*)}(.*)$/', $property, $match)) {
 				throw new \InvalidArgumentException('\'' . $property . '\' is not a valid clark-notation formatted string');
 			}
 			if ('DAV:' === $match[1]) {
-				$body .= "    <d:{$match[2]} />\n";
+				$body .= "<d:{$match[2]}/>";
 			} else {
-				$body .= "    <x:{$match[2]} xmlns:x=\"{$match[1]}\"/>\n";
+				$body .= "<x:{$match[2]} xmlns:x=\"{$match[1]}\"/>";
 			}
 		}
 
-		$body .= '  </d:prop>' . "\n";
-		$body .= '</d:propfind>';
+		$body .= '</d:prop></d:propfind>';
 
 		$response = $this->request('PROPFIND', $url, $body, array(
 			"Depth: {$depth}",
@@ -144,7 +147,7 @@ class Client
 			null, LIBXML_NOBLANKS | LIBXML_NOCDATA);
 
 		if (false === $responseXML) {
-			throw new \InvalidArgumentException('The passed data is not valid XML');
+			throw new \UnexpectedValueException("The passed data is not valid XML\n{$response->body}");
 		}
 
 		$ns = \array_search('urn:DAV', $responseXML->getNamespaces(true)) ?: 'd';
@@ -163,13 +166,18 @@ class Client
 				foreach ($propStat->xpath("{$ns}:prop") as $prop) {
 					foreach ($prop->xpath("*") as $element) {
 						$propertyName = self::toClarkNotation($element);
+						$propList[$propertyName] = [];
 						if ('{DAV:}resourcetype' === $propertyName) {
-							$propList[$propertyName] = [];
 							foreach ($element->xpath("*") as $resourcetype) {
 								$propList[$propertyName][] = self::toClarkNotation($resourcetype);
 							}
 						} else {
-							$propList[$propertyName] = (string) $element;
+							foreach ($element->xpath("*") as $child) {
+								$propList[$propertyName][self::toClarkNotation($child)] = (string) $child;
+							}
+							if (!$propList[$propertyName]) {
+								$propList[$propertyName] = (string) $element;
+							}
 						}
 					}
 				}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/dns.php b/snappymail/v/0.0.0/app/libraries/snappymail/dns.php
index 302f2e841..cb3ebda20 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/dns.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/dns.php
@@ -4,6 +4,10 @@ namespace SnappyMail;
 
 abstract class DNS
 {
+	/**
+	 * $domain = 'bimigroup.org'
+	 * Then a TXT lookup is done on 'default._bimi.bimigroup.org'
+	 */
 	public static function BIMI(string $domain) : string
 	{
 		$oCache = \RainLoop\Api::Actions()->Cacher();
@@ -18,7 +22,7 @@ abstract class DNS
 		}
 		if (null === $BIMI) {
 			$BIMI = '';
-			$values = \dns_get_record($domain, \DNS_TXT);
+			$values = \dns_get_record("default._bimi.{$domain}", \DNS_TXT);
 			if ($values) {
 				foreach ($values as $value) {
 					if (\str_starts_with($value['txt'], 'v=BIMI1')) {
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/file/magic.mime.php b/snappymail/v/0.0.0/app/libraries/snappymail/file/magic.mime.php
new file mode 100644
index 000000000..2b79d0069
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/file/magic.mime.php
@@ -0,0 +1,34 @@
+<?php
+$magic = array(
+	'#^\x37\x7A.*#s'          => 'application/x-7z-compressed', # unknown by magic.mime
+	'#^BZh.*#s'               => 'application/x-bzip2',
+	'#^\x1f\x8b.*#s'          => 'application/x-gzip',
+	'#^.{257}ustar  \x00.*#s' => 'application/x-gtar',
+	'#^.{257}ustar\x00.*#s'   => 'application/x-tar',
+	'#^Rar!.*#s'              => 'application/x-rar-compressed',
+	'#^PK\x03\x04.*#s'        => 'application/zip',
+
+	'#^%PDF-.*#s'  => 'application/pdf',
+	'#^[CF]WS.*#s' => 'application/x-shockwave-flash',
+
+	'#^(.*\n)?(INSERT|CREATE|DROP|DELETE|ALTER|UPDATE)\ .*#is' => 'text/x-sql',
+	'#^BEGIN:VCARD#s' => 'text/x-vcard',
+
+	'#^GIF8.*#s'       => 'image/gif',
+	'#^.{8}heic#s'     => 'image/heic', // https://nokiatech.github.io/heif/technical.html
+	'#^\xFF\xD8.*#s'   => 'image/jpeg',
+	'#^\x89PNG.*#s'    => 'image/png',
+	'#^.PNG.*#s'       => 'image/png',
+	'#^<svg.*#s'       => 'image/svg+xml', # wild guess, unknown by magic.mime
+	'#^RIFF.{4}WEBP#s' => 'image/webp',
+
+	'#^FLV.*#s'      => 'video/x-flv',
+	'#^OggS.+\x80theora.*#s' => 'video/ogg',
+
+	'#^ID3.*#s'      => 'audio/mpeg', # wild guess?
+	'#^\xff\xfa.*#s' => 'audio/mpeg', # wild guess?
+	'#^OggS.+\x01vorbis.*#s' => 'audio/ogg',
+
+	'#^\xD0\xCF\x11\xE0\xA1.*#s' => 'application/msword',
+	'#^OggS.*#s'     => 'application/ogg',
+);
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php b/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php
new file mode 100644
index 000000000..ba44e9cd6
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php
@@ -0,0 +1,276 @@
+<?php
+
+namespace SnappyMail\File;
+
+// use MailSo\Mime\Enumerations\MimeType;
+
+abstract class MimeType
+{
+	protected static $finfo = null;
+
+	protected static function initFInfo() : void
+	{
+		if (null === self::$finfo) {
+//			if (!\getenv('MAGIC')) { \putenv('MAGIC='.__DIR__.'/magic.mime'.(WINDOWS_OS?'.win32':'')); } # /usr/share/misc/magic
+			self::$finfo = \class_exists('finfo', false) ? new \finfo(FILEINFO_MIME) : false; // FILEINFO_CONTINUE
+		}
+	}
+
+	protected static function detectDeeper(string $mime, string $name = '') : string
+	{
+		if ('application/ogg' === $mime
+		 || 'application/vnd.ms-office' === $mime
+		 || 'application/octet-stream' === $mime
+		 || 'application/zip' === $mime) {
+			return static::fromFilename($name) ?: $mime;
+		}
+		return $mime;
+	}
+
+	public static function fromFile(string $filename, string $name = '') : ?string
+	{
+		$mime = null;
+		if (\is_file($filename)) {
+			static::initFInfo();
+			if (self::$finfo) {
+				$mime = \preg_replace('#[,;].*#', '', self::$finfo->file($filename));
+			}
+			if (!$mime && $fp = \fopen($filename, 'rb')) {
+				$mime = self::fromStream($fp);
+				\fclose($fp);
+			}
+			if ('application/zip' === \str_replace('/x-', '/', $mime)) {
+				$zip = new \ZipArchive($filename);
+				if (false !== $zip->locateName('word/_rels/document.xml.rels')) {
+					return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+				}
+				if (false !== $zip->locateName('xl/_rels/workbook.xml.rels')) {
+					return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+				}
+			}
+		}
+		return $mime ? static::detectDeeper($mime, $name ?: $filename) : null;
+	}
+
+	public static function fromStream($stream, string $name = '') : ?string
+	{
+		if (\is_resource($stream) && \stream_get_meta_data($stream)['seekable']) {
+			$pos = \ftell($stream);
+//			if (\is_int($pos) && \rewind($stream)) {
+			if (\is_int($pos) && 0 === \fseek($stream, 0)) {
+//				$str = \fread($stream, 265);
+				$str = \stream_get_contents($stream, 265, 0);
+				\fseek($stream, $pos);
+				if ($str) {
+					return static::fromString($str, $name);
+				}
+			}
+		}
+		return null;
+	}
+
+	public static function fromString(string &$str, string $name = '') : ?string
+	{
+		static::initFInfo();
+		$mime = self::$finfo
+			? \preg_replace('#[,;].*#', '', self::$finfo->buffer($str))
+			: self::getFromData($str);
+		return $mime ? static::detectDeeper($mime, $name) : null;
+	}
+
+	protected static function getFromData(string $str) : ?string
+	{
+		if (\str_contains($str, '-----BEGIN PGP SIGNATURE-----')) {
+			return 'application/pgp-signature';
+		}
+		if (\preg_match('/-----BEGIN PGP (PUBLIC|PRIVATE) KEY BLOCK-----/', $str)) {
+			return 'application/pgp-keys';
+		}
+		static $magic;
+		if (!$magic) {
+			require __DIR__ . '/magic.mime.php';
+		}
+		$str = \preg_replace(\array_keys($magic), \array_values($magic), $str, 1, $c);
+		return $c ? $str : null;
+	}
+
+	public static function fromFilename(string $filename) : ?string
+	{
+		$filename = \strtolower($filename);
+		if ('winmail.dat' === $filename) {
+			return 'application/ms-tnef';
+		}
+		$extension = \explode('.', $filename);
+		$extension = \array_pop($extension);
+		return isset(static::$types[$extension]) ? static::$types[$extension] : null;
+	}
+
+	/**
+	 * Issue with 'text/plain'
+	 */
+	public static function toExtension(string $mime, bool $include_dot = true) : ?string
+	{
+		$mime = \strtolower($mime);
+		if ('application/pgp-signature' == $mime || 'application/pgp-keys' == $mime) {
+			$ext = 'asc';
+		} else {
+			$mime = \str_replace('application/x-tar', 'application/gtar', $mime);
+			$ext = \array_search($mime, static::$types)
+				?: \array_search(\str_replace('/x-', '/', $mime), static::$types)
+				?: \array_search(\str_replace('/', '/x-', $mime), static::$types)
+				?: 'bin';
+		}
+		return ($include_dot ? '.' : '') . $ext;
+	}
+
+	protected static $types = [
+		'7z' => 'application/x-7z-compressed',
+		'ai' => 'application/postscript',
+//		'asc' => 'application/pgp-signature',
+//		'asc' => 'application/pgp-keys',
+		'bat' => 'application/x-msdownload',
+		'bz' => 'application/x-bzip',
+		'bz2' => 'application/x-bzip2',
+		'cab' => 'application/vnd.ms-cab-compressed',
+		'chm' => 'application/vnd.ms-htmlhelp',
+		'com' => 'application/x-msdownload',
+		'deb' => 'application/x-debian-package',
+		'dll' => 'application/x-msdownload',
+		'doc' => 'application/msword',
+		'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+		'dot' => 'application/msword',
+		'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+		'eps' => 'application/postscript',
+		'epub' => 'application/epub',
+		'exe' => 'application/x-msdownload',
+		'gz' => 'application/gzip',
+		'gz' => 'application/x-gzip',
+		'hlp' => 'application/winhlp',
+		'js' => 'application/javascript',
+		'json' => 'application/json',
+		'msi' => 'application/x-msdownload',
+		'odp' => 'application/vnd.oasis.opendocument.presentation',
+		'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+		'odt' => 'application/vnd.oasis.opendocument.text',
+		'ogx' => 'application/ogg',
+		'p10' => 'application/pkcs10',
+		'p7c' => 'application/pkcs7-mime',
+		'p7m' => 'application/pkcs7-mime',
+		'p7s' => 'application/pkcs7-signature',
+		'pdf' => 'application/pdf',
+		'php' => 'application/x-httpd-php',
+		'php' => 'application/x-php',
+		'ppt' => 'application/vnd.ms-powerpoint',
+		'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+		'ps' => 'application/postscript',
+		'psd' => 'image/vnd.adobe.photoshop',
+		'rar' => 'application/rar-compressed',
+		'rar' => 'application/x-rar-compressed',
+		'rtf' => 'application/rtf',
+		'scr' => 'application/x-msdownload',
+		'sql' => 'application/sql',
+		'swf' => 'application/shockwave-flash',
+		'swf' => 'application/x-shockwave-flash',
+		'tar' => 'application/gtar',
+//		'tar' => 'application/x-tar',
+//		'tgz' => 'application/x-gzip',
+		'torrent' => 'application/x-bittorrent',
+		'wgt' => 'application/widget',
+		'xls' => 'application/vnd.ms-excel',
+		'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+		'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+		'zip' => 'application/zip',
+
+		'aac' => 'audio/aac',
+		'aif' => 'audio/aiff',
+		'aifc' => 'audio/aiff',
+		'aiff' => 'audio/aiff',
+		'flac' => 'audio/flac',
+		'm3u' => 'audio/x-mpegurl',
+		'midi' => 'audio/midi',
+		'mp3' => 'audio/mpeg',
+		'mp4a' => 'audio/mp4',
+		'ogg' => 'audio/ogg',
+		'wav' => 'audio/wav',
+		'weba' => 'audio/webm',
+
+		'ttf' => 'font/ttf',
+		'woff' => 'font/woff',
+		'woff2' => 'font/woff2',
+
+		'bmp' => 'image/bmp',
+		'cgm' => 'image/cgm',
+		'djv' => 'image/vnd.djvu',
+		'djvu' => 'image/vnd.djvu',
+		'gif' => 'image/gif',
+//		'heic' => 'image/heic',
+		'ico' => 'image/vnd.microsoft.icon',
+//		'ico' => 'image/x-icon',
+		'ief' => 'image/ief',
+		'jpeg' => 'image/jpeg',
+		'jfif' => 'image/jpeg',
+		'jpe' => 'image/jpeg',
+		'jpg' => 'image/jpeg',
+		'png' => 'image/png',
+		'svg' => 'image/svg+xml',
+		'svgz' => 'image/svg+xml',
+		'tiff' => 'image/tiff',
+		'tif' => 'image/tiff',
+		'webp' => 'image/webp',
+
+		'eml' => 'message/rfc822',
+		'mime' => 'message/rfc822',
+
+		'txt' => 'text/plain',
+		'asp' => 'text/asp',
+		'cfg' => 'text/plain',
+		'conf' => 'text/plain',
+		'css' => 'text/css',
+		'csv' => 'text/csv',
+		'def' => 'text/plain',
+		'html' => 'text/html',
+		'htm' => 'text/html',
+		'ics' => 'text/calendar',
+		'ifb' => 'text/calendar',
+		'in' => 'text/plain',
+		'ini' => 'text/plain',
+		'list' => 'text/plain',
+		'log' => 'text/plain',
+		'pl' => 'text/perl',
+		'rtx' => 'text/richtext',
+		'text' => 'text/plain',
+		'vcf' => 'text/vcard',
+		'vcard' => 'text/vcard',
+		'xml' => 'text/xml',
+
+		'3g2' => 'video/3gpp2',
+		'3gp' => 'video/3gpp',
+		'asf' => 'video/x-ms-asf',
+		'asx' => 'video/x-ms-asf',
+		'avi' => 'video/x-msvideo',
+		'flv' => 'video/flv',
+		'h261' => 'video/h261',
+		'h263' => 'video/h263',
+		'h264' => 'video/h264',
+		'jpgv' => 'video/jpgv',
+		'm4v' => 'video/x-m4v',
+		'mov' => 'video/quicktime',
+		'movie' => 'video/x-sgi-movie',
+		'mp4' => 'video/mp4',
+		'mp4v' => 'video/mp4',
+		'mpeg' => 'video/mpeg',
+		'm1v' => 'video/mpeg',
+		'm2v' => 'video/mpeg',
+		'mpe' => 'video/mpeg',
+		'mpg' => 'video/mpeg',
+		'mpg4' => 'video/mp4',
+		'ogv' => 'video/ogg',
+		'qt' => 'video/quicktime',
+		'webm' => 'video/webm',
+		'wm' => 'video/x-ms-wm',
+		'wmv' => 'video/x-ms-wmv',
+		'wmx' => 'video/x-ms-wmx',
+		'wvx' => 'video/x-ms-wvx',
+	];
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php
index 7e8382c17..947e8f47f 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php
@@ -10,7 +10,7 @@ class GnuPG
 {
 	private
 		$homedir,
-		// Instance of gnupg pecl extension
+		// Instance of gnupg pecl extension https://www.php.net/gnupg
 		$GnuPG,
 		// Instance of \SnappyMail\PGP\GPG
 		$GPG;
@@ -383,10 +383,10 @@ class GnuPG
 			: $this->GPG->verify($signed_text, $signature, $plaintext);
 		if (!$result) {
 			if ($this->GnuPG) {
-				\SnappyMail\Log::notice('gnupg_verify() failed: ' . $this->GnuPG->geterror());
-				\SnappyMail\Log::info(\print_r($this->GnuPG->geterrorinfo(),1));
+				\SnappyMail\Log::notice('GnuPG', 'gnupg_verify() failed: ' . $this->GnuPG->geterror());
+				\SnappyMail\Log::info('GnuPG', \print_r($this->GnuPG->geterrorinfo(),1));
 			} else {
-				\SnappyMail\Log::notice('GPG->verify() failed');
+				\SnappyMail\Log::notice('GPG', 'GPG->verify() failed');
 			}
 		}
 		return $result;
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gpg.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gpg.php
index 432ec9f84..0173febe7 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gpg.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gpg.php
@@ -188,6 +188,20 @@ class GPG
 		return true;
 	}
 
+	/**
+	 * TODO: parse result
+	 * https://github.com/the-djmaze/snappymail/issues/89
+	 */
+	protected function listDecryptKeys(/*string|resource*/ $input, /*string|resource*/ $output = null)
+	{
+		$this->setInput($input);
+		$fclose = $this->setOutput($output);
+		$_ENV['PINENTRY_USER_DATA'] = '';
+		$result = $this->exec(['--list-packets']);
+		$fclose && \fclose($fclose);
+		return $output ? true : ($result ? $result['output'] : false);
+	}
+
 	protected function _decrypt(/*string|resource*/ $input, /*string|resource*/ $output = null)
 	{
 		$this->setInput($input);
@@ -245,6 +259,7 @@ class GPG
 	 */
 	public function decryptVerify(string $text, string &$plaintext) /*: array|false*/
 	{
+		// TODO: https://github.com/the-djmaze/snappymail/issues/89
 		return false;
 	}
 
@@ -253,6 +268,7 @@ class GPG
 	 */
 	public function decryptVerifyFile(string $filename, string &$plaintext) /*: array|false*/
 	{
+		// TODO: https://github.com/the-djmaze/snappymail/issues/89
 		return false;
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php
index 4a84b4835..52608a49f 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php
@@ -9,8 +9,10 @@ class Login extends \SnappyMail\SASL
 
 	public function authenticate(string $username, string $passphrase, ?string $challenge = null) : string
 	{
-		if ($challenge && 'Username:' !== $this->decode($challenge)) {
-			throw new \Exception("Invalid response: {$challenge}");
+		// $challenge should be 'VXNlcm5hbWU6', but broken on some systems
+		// See https://github.com/the-djmaze/snappymail/issues/693
+		if ($challenge && !\str_starts_with($this->decode($challenge), 'Username:')) {
+			throw new \Exception("Invalid response: {$this->decode($challenge)}");
 		}
 		$this->passphrase = $passphrase;
 		return $this->encode($username);
@@ -18,6 +20,7 @@ class Login extends \SnappyMail\SASL
 
 	public function challenge(string $challenge) : ?string
 	{
+		// $challenge should be 'UGFzc3dvcmQ6'
 		if ($challenge && 'Password:' !== $this->decode($challenge)) {
 			throw new \Exception("invalid response: {$challenge}");
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
index dc86c76c2..80e4d8bc6 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
@@ -132,7 +132,7 @@ abstract class Upgrade
 				if ($aData) {
 					$oActions->setContactsSyncData($oAccount, $aData);
 					return array(
-						'Enable' => isset($aData['Enable']) ? !!$aData['Enable'] : false,
+						'Mode' => empty($aData['Enable']) ? 0 : 1,
 						'Url' => isset($aData['Url']) ? \trim($aData['Url']) : '',
 						'User' => isset($aData['User']) ? \trim($aData['User']) : '',
 						'Password' => isset($aData['Password']) ? $aData['Password'] : ''
diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/user.json b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
index 3c6dc5ed8..c475bfff2 100644
--- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "مقروء",
 		"MENU_SELECT_FLAGGED": "محدد كـ مهم",
 		"MENU_SELECT_UNFLAGGED": "إزالة الأهمية",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "إفراغ القائمة",
 		"EMPTY_SEARCH_LIST": "ليست هناك أية رسائل تطابق بحثك.",
 		"SEARCH_RESULT_FOR": "نتيجة البحث لـ \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "لايوجد مرفقات",
 		"ATTACHMENTS_ERROR_DESC": "تحذير! لم يتم إرفاق جميع المرفقات",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "لم تنتهي عملية الإرفاق بعد",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "اطلب اعلاماً بالقراءة",
 		"BUTTON_MARK_AS_IMPORTANT": "تحديده كـ هام",
 		"BUTTON_REQUEST_DSN": "اطلب اعلاماً بايصال البريد"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "صوت التنبيهات",
 		"CHROME_NOTIFICATION_DESC": "إظهار نافذة منبثقة في حالة قدوم ايميل جديد",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(تم إعتراضها من قبل المتصفح)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "قم باضافة المستلمين تلقائيا الى دفتر العناوين",
diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/user.json b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
index 83683d0d4..e4fde44ee 100644
--- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Прочетени",
 		"MENU_SELECT_FLAGGED": "Маркирани с флаг",
 		"MENU_SELECT_UNFLAGGED": "С премахнат флаг",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Празен списък.",
 		"EMPTY_SEARCH_LIST": "Няма съобщения, които да отговарят на търсенето.",
 		"SEARCH_RESULT_FOR": "Резултати от търсенето за \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Няма прикрепени файлове.",
 		"ATTACHMENTS_ERROR_DESC": "Внимание! Не всички прикачени файлове са качени.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Все още не са качени всички прикрепени файлове",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Поискайте разписка за прочитане на съобщението",
 		"BUTTON_MARK_AS_IMPORTANT": "Отбележи като важно",
 		"BUTTON_REQUEST_DSN": "Уведомяване при доставка"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Звуково известяване",
 		"CHROME_NOTIFICATION_DESC": "Покажи известие при ново съобщение",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Блокирано от браузъра)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Автоматично добавяне на получателите към адресната ви книга",
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
index e992a8b82..4cff69f51 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Současné heslo",
 		"LABEL_NEW_PASSWORD": "Nové heslo",
 		"LABEL_REPEAT_PASSWORD": "Znovu",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Vyžadovat ověření SSL certifikátu (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Vyžadovat ověření SSL certifikátu",
 		"LABEL_ALLOW_SELF_SIGNED": "Povolit self-signed certifikáty"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "unstable",
 		"WARNING": "Varování!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
index 0b843760b..4dbc983c6 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Přečtené",
 		"MENU_SELECT_FLAGGED": "Označené",
 		"MENU_SELECT_UNFLAGGED": "Neoznačené",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Seznam je prázdný",
 		"EMPTY_SEARCH_LIST": "Vašemu vyhledávání neodpovídají žádné zprávy.",
 		"SEARCH_RESULT_FOR": "Výsledky vyhledávání pro \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Žádné přílohy.",
 		"ATTACHMENTS_ERROR_DESC": "Upozornění! Některé přílohy nebyly nahrány.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Některé přílohy ještě nebyly nahrány",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Vyžádat si potvrzení o přečtení",
 		"BUTTON_MARK_AS_IMPORTANT": "Označit jako důležité",
 		"BUTTON_REQUEST_DSN": "Vyžádat si potvrzení o přijetí"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Zvukové notifikace",
 		"CHROME_NOTIFICATION_DESC": "Zobrazovat upozornění na nové zprávy",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prohlížečem)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automaticky přidávat adresy příjemců do Adresáře",
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/admin.json b/snappymail/v/0.0.0/app/localization/da-DK/admin.json
index 618fa31e9..3738205c3 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Nuværende adgangskode",
 		"LABEL_NEW_PASSWORD": "Ny adgangskode",
 		"LABEL_REPEAT_PASSWORD": "Gentag",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Kræv verifikation af brugt SSL certifikat (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Kræv verifikation af brugt SSL certifikat",
 		"LABEL_ALLOW_SELF_SIGNED": "Tillad selvsignerede certifikater"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "ustabil",
 		"WARNING": "Advarsel!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/user.json b/snappymail/v/0.0.0/app/localization/da-DK/user.json
index 42ebf81d4..4188896ba 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/user.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Læst",
 		"MENU_SELECT_FLAGGED": "Markeret med flag",
 		"MENU_SELECT_UNFLAGGED": "Ikke markeret med flag",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Ingen meddelelser.",
 		"EMPTY_SEARCH_LIST": "Ingen meddelelser passede på søgningen.",
 		"SEARCH_RESULT_FOR": "Resultat for søgningen på \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Ingen vedhæftninger.",
 		"ATTACHMENTS_ERROR_DESC": "Advarsels! Ikke alle vedhæftninger er overført.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Overførsel af vedhæftninger igang.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Bed om kvittering for læsning",
 		"BUTTON_MARK_AS_IMPORTANT": "Markér som vigtig",
 		"BUTTON_REQUEST_DSN": "Bed om kvittering for modtagelse"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Lyd notifikationer",
 		"CHROME_NOTIFICATION_DESC": "Vis ny meddelelses notifikations popup",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Blokeret af browseren)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Tilføj automatisk modtager til adressebog",
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/admin.json b/snappymail/v/0.0.0/app/localization/de-DE/admin.json
index 1e3c7af12..3eb59756c 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Aktuelles Passwort",
 		"LABEL_NEW_PASSWORD": "Neues Passwort",
 		"LABEL_REPEAT_PASSWORD": "Wiederholen",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Verlangen, dass das verwendete SSL-Zertifikat signiert ist (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Verlangen, dass das verwendete SSL-Zertifikat signiert ist",
 		"LABEL_ALLOW_SELF_SIGNED": "Selbst-signierte Zertifikate erlauben"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "Beta",
-		"UNSTABLE": "Nicht stabil",
 		"WARNING": "Warnung!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/user.json b/snappymail/v/0.0.0/app/localization/de-DE/user.json
index 2fc355dc6..0d0df500f 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/user.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Gelesen",
 		"MENU_SELECT_FLAGGED": "Markiert",
 		"MENU_SELECT_UNFLAGGED": "Nicht markiert",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Liste ist leer.",
 		"EMPTY_SEARCH_LIST": "Keine Treffer für Ihre Suche.",
 		"SEARCH_RESULT_FOR": "Suchergebnisse für \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Keine Anhänge vorhanden.",
 		"ATTACHMENTS_ERROR_DESC": "Warnung! Nicht alle Anhänge wurden hochgeladen.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Es wurden noch nicht alle Anhänge hochgeladen.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Empfangsbestätigung anfordern",
 		"BUTTON_MARK_AS_IMPORTANT": "Als Wichtig markieren",
 		"BUTTON_REQUEST_DSN": "Übermittlungsstatus anfordern"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Benachrichtigungston",
 		"CHROME_NOTIFICATION_DESC": "Popups einblenden, wenn neue Nachrichten vorhanden sind",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Vom Browser blockiert.)",
-		"LIST_INLINE_ATTACHMENTS": "Inline-Anhänge in der Liste anzeigen"
+		"LIST_INLINE_ATTACHMENTS": "Inline-Anhänge in der Liste anzeigen",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Empfänger automatisch zu Ihrem Adressbuch hinzuzufügen",
diff --git a/snappymail/v/0.0.0/app/localization/el-GR/user.json b/snappymail/v/0.0.0/app/localization/el-GR/user.json
index 45de909ef..f13a8fef9 100644
--- a/snappymail/v/0.0.0/app/localization/el-GR/user.json
+++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Διαβασμένο",
 		"MENU_SELECT_FLAGGED": "Σημαδεμένο",
 		"MENU_SELECT_UNFLAGGED": "Μη σημαδεμένο",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Άδεια λίστα.",
 		"EMPTY_SEARCH_LIST": "Δεν υπάρχουν μηνύματα που να ταιριάζουν στην αναζήτηση.",
 		"SEARCH_RESULT_FOR": "Αποτελέσματα αναζήτησης για \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Δεν υπάρχουν συνημμένα εδώ.",
 		"ATTACHMENTS_ERROR_DESC": "Προειδοποίηση! Δεν έχουν μεταφορτωθεί όλα τα συνημμένα.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Δεν έχουν μεταφορτωθεί ακόμη όλα τα συνημμένα.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Ζητήστε αποδεικτικό ανάγνωσης",
 		"BUTTON_MARK_AS_IMPORTANT": "Σημειώστε το σαν σημαντικό",
 		"BUTTON_REQUEST_DSN": "Ζητήστε αποδεικτικό παράδοσης"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Ηχητική επισήμανση",
 		"CHROME_NOTIFICATION_DESC": "Να εμφανίζονται τα νέα μηνύματα σε αναδυόμενες επισημάνσεις",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Αποκλείστηκε από το φυλλομετρητή)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Αυτόματη προσθήκη επαφών στον κατάλογο διευθύνσεων",
diff --git a/snappymail/v/0.0.0/app/localization/en-GB/user.json b/snappymail/v/0.0.0/app/localization/en-GB/user.json
index 8d276f331..e9c8c3cd1 100644
--- a/snappymail/v/0.0.0/app/localization/en-GB/user.json
+++ b/snappymail/v/0.0.0/app/localization/en-GB/user.json
@@ -76,7 +76,7 @@
 		"INBOX_NAME": "Inbox",
 		"SENT_NAME": "Sent",
 		"DRAFTS_NAME": "Drafts",
-		"TRASH_NAME": "Bin",
+		"TRASH_NAME": "Deleted",
 		"ARCHIVE_NAME": "Archive"
 	},
 	"QUOTA": {
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Read",
 		"MENU_SELECT_FLAGGED": "Flagged",
 		"MENU_SELECT_UNFLAGGED": "Unflagged",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Empty list.",
 		"EMPTY_SEARCH_LIST": "No messages matched your search.",
 		"SEARCH_RESULT_FOR": "Search results for \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt"
@@ -334,7 +336,7 @@
 		"NOTIFICATION_SENT": "You haven't selected \"Sent\" system folder messages are put to after sending.\nIf you don't want to save sent message, please select \"Do not use\" option.\n",
 		"NOTIFICATION_DRAFTS": "You haven't selected \"Drafts\" system folder messages are saved to while composing.",
 		"NOTIFICATION_SPAM": "You haven't selected \"Spam\" system folder spamed messages are placed to.\nIf you wish to remove messages permanently, please select \"Do not use\" option.\n",
-		"NOTIFICATION_TRASH": "You haven't selected \"Bin\" system folder deleted messages are placed to.\nIf you wish to remove messages permanently, please select \"Do not use\" option.\n",
+		"NOTIFICATION_TRASH": "You haven't selected \"Deleted\" system folder deleted messages are placed to.\nIf you wish to remove messages permanently, please select \"Do not use\" option.\n",
 		"NOTIFICATION_ARCHIVE": "You haven't selected \"Archive\" system folder achived messages are placed to."
 	},
 	"TITLES": {
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Sound notification",
 		"CHROME_NOTIFICATION_DESC": "Show new messages notification popups",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Blocked by the browser)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatically add recipients to your address book",
diff --git a/snappymail/v/0.0.0/app/localization/en/admin.json b/snappymail/v/0.0.0/app/localization/en/admin.json
index cf11138be..b8246b803 100644
--- a/snappymail/v/0.0.0/app/localization/en/admin.json
+++ b/snappymail/v/0.0.0/app/localization/en/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Current password",
 		"LABEL_NEW_PASSWORD": "New password",
 		"LABEL_REPEAT_PASSWORD": "Repeat",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate used (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate",
 		"LABEL_ALLOW_SELF_SIGNED": "Allow self signed certificates"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "unstable",
 		"WARNING": "Warning!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/en/user.json b/snappymail/v/0.0.0/app/localization/en/user.json
index 7a0fae99e..97a8dc596 100644
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Read",
 		"MENU_SELECT_FLAGGED": "Flagged",
 		"MENU_SELECT_UNFLAGGED": "Unflagged",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Empty list.",
 		"EMPTY_SEARCH_LIST": "No messages matched your search.",
 		"SEARCH_RESULT_FOR": "Search results for \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Sound notification",
 		"CHROME_NOTIFICATION_DESC": "Show new messages notification popups",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Blocked by the browser)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatically add recipients to your address book",
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/admin.json b/snappymail/v/0.0.0/app/localization/es-ES/admin.json
index c0289ad7a..2751bcf33 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/admin.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Contraseña actual",
 		"LABEL_NEW_PASSWORD": "Nueva contraseña",
 		"LABEL_REPEAT_PASSWORD": "Re-ingresar",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Requerir verificación del certificado SSL (IMAP \/ SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Requerir verificación del certificado SSL",
 		"LABEL_ALLOW_SELF_SIGNED": "Permitir certificados auto-firmados"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "inestable",
 		"WARNING": "¡Atención!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/user.json b/snappymail/v/0.0.0/app/localization/es-ES/user.json
index 362637e6b..03eab2015 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/user.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Leído",
 		"MENU_SELECT_FLAGGED": "Destacado",
 		"MENU_SELECT_UNFLAGGED": "No Destacado",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "No hay mensajes.",
 		"EMPTY_SEARCH_LIST": "La búsqueda no ha producido resultados.",
 		"SEARCH_RESULT_FOR": "Resultados de búsqueda para \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "No hay adjuntos aquí.",
 		"ATTACHMENTS_ERROR_DESC": "¡Atención! No se han subido todos los archivos adjuntos.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "No se han subido todos los archivos adjuntos.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Solicitar confirmación de lectura",
 		"BUTTON_MARK_AS_IMPORTANT": "Marcar como importante",
 		"BUTTON_REQUEST_DSN": "Solicitar una confirmación de entrega"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Sonido de la notificación",
 		"CHROME_NOTIFICATION_DESC": "Mostrar notificación de nuevos mensajes en Popup",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado por el explorador)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Agregar automáticamente destinatarios a la libreta de direcciones",
diff --git a/snappymail/v/0.0.0/app/localization/et-EE/user.json b/snappymail/v/0.0.0/app/localization/et-EE/user.json
index 4e7460105..544fdd3b1 100644
--- a/snappymail/v/0.0.0/app/localization/et-EE/user.json
+++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Loetud",
 		"MENU_SELECT_FLAGGED": "Lipuga märgitud",
 		"MENU_SELECT_UNFLAGGED": "Lipuga märkimata",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tühi nimekiri",
 		"EMPTY_SEARCH_LIST": "Otsingule ei vastanud ühtegi kirja",
 		"SEARCH_RESULT_FOR": "Vasted otsingule \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Manused puuduvad.",
 		"ATTACHMENTS_ERROR_DESC": "Tähelepanu! Kõiki manuseid ei ole üles laetud.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Kõiki manuseid ei ole veel üles laetud.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Palu lugemise kohta kinnitust",
 		"BUTTON_MARK_AS_IMPORTANT": "Tähista olulisena",
 		"BUTTON_REQUEST_DSN": "Palu kättesaamise kohta kinnitust"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Teavitused heliga",
 		"CHROME_NOTIFICATION_DESC": "Näita uute kirjade teavitust hüpikaknaga",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Veebilehitseja poolt blokeeritud)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Lisa saajad automaatselt aadressiraamatusse",
diff --git a/snappymail/v/0.0.0/app/localization/eu/admin.json b/snappymail/v/0.0.0/app/localization/eu/admin.json
new file mode 100644
index 000000000..696283b52
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/eu/admin.json
@@ -0,0 +1,180 @@
+{
+	"GLOBAL": {
+		"ADD": "Gehitu",
+		"CLOSE": "Itxi",
+		"SAVE": "Gorde",
+		"TEST": "Probatu",
+		"UPDATE": "Eguneratu",
+		"USERNAME": "Erabiltzailea",
+		"PASSWORD": "Pasahitza",
+		"CANCEL": "Ezeztatu"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Login",
+		"LABEL_PASSWORD": "Pasahitza",
+		"LABEL_TOTP": "TOTP kodea",
+		"BUTTON_LOGIN": "Administradore panelean saioa hasi"
+	},
+	"TOP_PANEL": {
+		"LABEL_ADMIN_PANEL": "Administradore Panela"
+	},
+	"SETTINGS_LABELS": {
+		"LABEL_GENERAL_NAME": "Orokorra",
+		"LABEL_LOGIN_NAME": "Login",
+		"LABEL_BRANDING_NAME": "Marka",
+		"LABEL_CONTACTS_NAME": "Kontaktuak",
+		"LABEL_DOMAINS_NAME": "Domeinuak",
+		"LABEL_SECURITY_NAME": "Segurtasuna",
+		"LABEL_PACKAGES_NAME": "Gehigarriak",
+		"LABEL_CONFIG_NAME": "Ezarpenak",
+		"LABEL_ABOUT_NAME": "Honi buruz"
+	},
+	"TAB_GENERAL": {
+		"LEGEND_INTERFACE": "Interfazea",
+		"LABEL_LANGUAGE": "Hizkuntza",
+		"LABEL_LANGUAGE_ADMIN": "Hizkuntza (admin)",
+		"LABEL_THEME": "Gaia",
+		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Baimendu hizkuntza aukeratzea ezarpenen pantailan",
+		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Baimendu gaia aukeratzea ezarpenen pantailan",
+		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Baimendu atzealdeko irudia aukeratzea ezarpenen pantailan",
+		"LABEL_SHOW_THUMBNAILS": "Erakutsi miniaturak (gehigarriak)",
+		"LEGEND_MAIN": "Nagusia",
+		"LABEL_ATTACHMENT_SIZE_LIMIT": "Eranskinen tamaina-muga",
+		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Onartu kontu gehigarriak",
+		"LABEL_ALLOW_IDENTITIES": "Onartu nortasun gehigarriak",
+		"ALERT_DATA_ACCESS": "Datu karpeta eskuragarri dago. Mesedez, konfigruatu zure web zerbitzaria datuen karpeta kanpoko sarbidetik ezkutatzeko. Irakurri gehiago hemen:",
+		"ALERT_WARNING": "Kontuz!",
+		"HTML_ALERT_WEAK_PASSWORD": "Lehenetsitako administradore pasahitza erabiltzen ari zara.\n<br>\nSegurtasunagatik, mesedez,\n<strong><a href=\"#\/security\">aldatu<\/a><\/strong>\npasahitza beste zerbaitetara orain.\n"
+	},
+	"TAB_LOGIN": {
+		"LEGEND_LOGIN_SCREEN": "Saio hasiera pantaila",
+		"LABEL_DEFAULT_DOMAIN": "Lehenetsitako Domeinua",
+		"LABEL_DETERMINE_USER_DOMAIN": "Saiatu zehazten erabiltzailearen domeinua",
+		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Onartu hizkuntza hautaketa saio-hasiera pantailan",
+		"LABEL_DETERMINE_USER_LANGUAGE": "Saiatu zehazten erabiltzailearen hizkuntza"
+	},
+	"TAB_BRANDING": {
+		"LEGEND_BRANDING": "Marka",
+		"LABEL_PAGE_TITLE": "Orriaren izenburua",
+		"LABEL_LOADING_DESCRIPTION": "Deskribapena Kargatzen",
+		"LABEL_FAVICON_URL": "Favicon"
+	},
+	"TAB_CONTACTS": {
+		"LEGEND_CONTACTS": "Kontaktuak",
+		"LEGEND_STORAGE": "Biltegia (PDO)",
+		"LABEL_ENABLE_CONTACTS": "Gaitu kontaktuak",
+		"LABEL_ALLOW_SYNC": "Onartu kontaktuen sinkronizazioa (kanpoko CardDAV zerbitzaria)",
+		"LABEL_STORAGE_TYPE": "Mota",
+		"LABEL_STORAGE_DSN": "Dsn",
+		"LABEL_STORAGE_USER": "Erabiltzailea",
+		"LABEL_STORAGE_PASSWORD": "Pasahitza",
+		"ALERT_NOTICE": "Adi!",
+		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Ez erabili datubase hau erabiltzaile aktibo koputu handiarekin.",
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "Zure sistemak ez ditu kontaktuak onartzen.\n<br>\n<strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> gehigarria instalatu edo gaitu behar duzu zure zerbitzarian.\n"
+	},
+	"TAB_DOMAINS": {
+		"LEGEND_DOMAINS": "Domeinuak",
+		"BUTTON_ADD_DOMAIN": "Gehitu Domeinua",
+		"BUTTON_ADD_ALIAS": "gehitu Aliasa",
+		"DELETE_ARE_YOU_SURE": "Ziur zaude?",
+		"HTML_DOMAINS_HELPER": "Webmail-a sartzera baimenduta dagoen domeinu zerrenda.\n<br>\nKlikatu izenean domeinua konfiguratzeko.\n"
+	},
+	"TAB_SECURITY": {
+		"LEGEND_SECURITY": "Segurtasuna",
+		"LABEL_USE_IMAGE_PROXY": "Erabili proxy lokala kanpoko irudientzat",
+		"LABEL_ALLOW_OPEN_PGP": "Baimendu OpenPGP",
+		"LABEL_SHOW_PHP_INFO": "Erakutsi PHP informazioa",
+		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panelerako Sarbide Kredentzialak",
+		"LABEL_CURRENT_PASSWORD": "Uneko pasahitza",
+		"LABEL_NEW_PASSWORD": "Pasahitz berria",
+		"LABEL_REPEAT_PASSWORD": "Errepikatu",
+		"LABEL_REQUIRE_VERIFICATION": "SSL ziurtagiriaren baliozkotzea eskatu",
+		"LABEL_ALLOW_SELF_SIGNED": "Onartu norberak sinatutako ziurtagiriak"
+	},
+	"TAB_PACKAGES": {
+		"LABEL_ENABLE_PLUGINS": "Onartu gehigarriak",
+		"LEGEND_AVAILABLE_FOR_UPDATE": "Eguneratzeko eskuragarri",
+		"LEGEND_AVAILABLE_FOR_INSTALLATION": "Instalatzeko eskuragarri",
+		"LEGEND_INSTALLED_PACKAGES": "Instalatutako Gehigarriak",
+		"ALERT_CANNOT_ACCESS_REPOSITORY": "Ezin da sartu biltegira une honetan."
+	},
+	"TAB_ABOUT": {
+		"LEGEND_ABOUT": "Honi buruz",
+		"LABEL_TAG_HINT": "Weban oinarritutako email-bezero erraz, moderno eta azkarra",
+		"LABEL_ALL_RIGHTS_RESERVED": "Eskubide guztiak gordeak.",
+		"HINT_READ_CHANGE_LOG": "Mesedez irakurri aldaketen informea eguneratu aurretik.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail eguneratuta dago.",
+		"HTML_NEW_VERSION": "<b>%VERSION%</b> bertsio berria eskuragarri.",
+		"LABEL_UPDATING": "Eguneratzen",
+		"LABEL_CHECKING": "Eguneraketak dauden begiratzen",
+		"BUTTON_RELEASES": "Bertsioak"
+	},
+	"POPUPS_DOMAIN_ALIAS": {
+		"TITLE_ADD_DOMAIN_ALIAS": "Gehitu Aliasa",
+		"LABEL_ALIAS": "Alias",
+		"LABEL_DOMAIN": "Domeinua"
+	},
+	"POPUPS_DOMAIN": {
+		"TITLE_ADD_DOMAIN": "Gehitu Domeinua",
+		"TITLE_ADD_DOMAIN_WITH_NAME": "Gehitu Domeinua \"%NAME%\"",
+		"TITLE_EDIT_DOMAIN": "Editatu Domeinua \"%NAME%\"",
+		"LABEL_NAME": "Izena",
+		"NAME_HELPER": "komodina onartuta",
+		"LABEL_IMAP": "IMAP",
+		"LABEL_SMTP": "SMTP",
+		"LABEL_SIEVE": "SIEVE",
+		"LABEL_SERVER": "Zerbitzaria",
+		"LABEL_PORT": "Portua",
+		"LABEL_SECURE": "Segurtasuna",
+		"LABEL_WHITE_LIST": "Zerrenda Zuria",
+		"SECURE_OPTION_NONE": "Bat ere ez",
+		"SECURE_OPTION_SSL": "SSL\/TLS",
+		"SECURE_OPTION_STARTTLS": "STARTTLS",
+		"LABEL_ALLOW_SIEVE_SCRIPTS": "Onartu sieve scriptak",
+		"LABEL_USE_SHORT_LOGIN": "Erabili login motza",
+		"LABEL_USE_AUTH": "Erabili autentikazioa",
+		"LABEL_SET_SENDER": "Erabili logina bidaltzaile bezala",
+		"LABEL_USE_PHP_MAIL": "Erabili php mail() funtzioa",
+		"BUTTON_WHITE_LIST": "Zerrenda Zuria",
+		"BUTTON_SIEVE_CONFIGURATION": "Sieve ezarpenak",
+		"BUTTON_BACK_TO_IMAP": "Itzuli IMAP ezarpenetara",
+		"BUTTON_BACK": "Atzera",
+		"BUTTON_UPDATE": "Eguneratu",
+		"NEW_DOMAIN_DESC": "Domeinu honen konfigurazioak <br><i>%NAME%<\/i> email kontuarekin lan egitea ahalbideratuko dizu.",
+		"WHITE_LIST_ALERT": "Webmailak sartzeko baimena duen domeinuko erabiltzaileen zerrenda.\nErabili hutsunea banatzaile bezala.\n"
+	},
+	"POPUPS_PLUGIN": {
+		"TITLE_PLUGIN": "Gehigarria",
+		"DESC_NOTHING_TO_CONFIGURE": "Ez dago kongiguratzeko ezer"
+	},
+	"POPUPS_ASK": {
+		"BUTTON_YES": "Bai",
+		"BUTTON_NO": "Ez",
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Ziur zaude leiho hau itxi nahi duzula?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Aukeratu zure hizkuntza"
+	},
+	"HINTS": {
+		"BETA": "beta",
+		"WARNING": "Kontuz!"
+	},
+	"ERRORS": {
+		"DOMAIN_ALREADY_EXISTS": "Domeinua jadanik existizen da",
+		"UNKNOWN_ERROR": "Errore ezezaguna"
+	},
+	"NOTIFICATIONS": {
+		"REQUEST_ERROR": "Eskaerak huts egin du",
+		"REQUEST_ABORTED": "Eskaera bertan behera utzi da",
+		"REQUEST_TIMEOUT": "Eskaeraren denbora-muga gainditu da",
+		"INVALID_TOKEN": "Ez-baliozko tokena",
+		"AUTH_ERROR": "Autentikazioak huts egin du",
+		"DOMAIN_ALREADY_EXISTS": "Domeinua jadanik existitzen da",
+		"CANT_SAVE_PLUGIN_SETTINGS": "Ezin dira ezarpenak gorde",
+		"CANT_INSTALL_PACKAGE": "Akatsa gehigarria instalatzean",
+		"CANT_DELETE_PACKAGE": "Akatsa gehigarria kentzean",
+		"INVALID_PLUGIN_PACKAGE": "Ez-baliozko gehigarri paketea",
+		"UNSUPPORTED_PLUGIN_PACKAGE": "Gehigarri paketea ez da onartzen",
+		"UNKNOWN_ERROR": "Errore ezezaguna"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/eu/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/eu/relativetimeformat.js
new file mode 100644
index 000000000..29f66890d
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/eu/relativetimeformat.js
@@ -0,0 +1,75 @@
+{
+	long: {
+		year: {
+			past: {
+				one: "duela urtebete",
+				other: "duela {0} urte"
+			},
+			future: {
+				one: "urtebete barru",
+				other: "{0} urte barru"
+			}
+		},
+		month: {
+			past: {
+				one: "duela hilabete",
+				other: "duela {0} hilabete"
+			},
+			future: {
+				one: "hilabete barru",
+				other: "{0} hilabete barru"
+			}
+		},
+		week: {
+			past: {
+				one: "duela astebete",
+				other: "duela {0} aste"
+			},
+			future: {
+				one: "astebete barru",
+				other: "{0} aste barru"
+			}
+		},
+		day: {
+			past: {
+				one: "duela egun bat",
+				other: "duela {0} egun"
+			},
+			future: {
+				one: "egun bat barru",
+				other: "{0} egun barru"
+			}
+		},
+		hour: {
+			past: {
+				one: "duela ordubete",
+				other: "duela {0} ordu"
+			},
+			future: {
+				one: "ordubete barru",
+				other: "{0} ordu barru"
+			}
+		},
+		minute: {
+			past: {
+				one: "duela minutu {0}",
+				other: "duela {0} minutu"
+			},
+			future: {
+				one: "minutu {0} barru",
+				other: "{0} minutu barru"
+			}
+		},
+		second: {
+			past: {
+				one: "duela segundo {0}",
+				other: "duela {0} segundo"
+			},
+			future: {
+				one: "segundo {0} barru",
+				other: "{0} segundo barru"
+			}
+		}
+	},
+	plural: n => 1 == n ? 'one' : 'other'
+}
diff --git a/snappymail/v/0.0.0/app/localization/eu/static.json b/snappymail/v/0.0.0/app/localization/eu/static.json
new file mode 100644
index 000000000..1ea35b0d2
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/eu/static.json
@@ -0,0 +1,9 @@
+{
+	"BACK_LINK": "Birkargatu",
+	"NO_SCRIPT_TITLE": "JavaScript beharrezkoa da aplikazio honetarako.",
+	"NO_SCRIPT_DESC": "Zure nabigatzaileak ez du JavaScript onartzen.\nMesedez gaitu JavaScript zure nabigatzailearen ezarpenetan eta saiatu berriro.\n",
+	"NO_COOKIE_TITLE": "Cookieak onartzea behar da aplikazio honetarako.",
+	"NO_COOKIE_DESC": "Zure nabigatzaileak ez ditu Cookieak onartzen.\nMesedez gaitu Cookieak zure nabigatzailearen ezarpenetan eta saiatu berriro.\n",
+	"BAD_BROWSER_TITLE": "Zure nabigatzailea ez dago eguneratuta.",
+	"BAD_BROWSER_DESC": "Aplikazio honen ezaugarri gutziak erabiltzeko,\ndeskargatu eta instalatu ondo nabigatzaileetako bat:\n"
+}
diff --git a/snappymail/v/0.0.0/app/localization/eu/user.json b/snappymail/v/0.0.0/app/localization/eu/user.json
new file mode 100644
index 000000000..0b76a0da7
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/eu/user.json
@@ -0,0 +1,556 @@
+{
+	"GLOBAL": {
+		"TO_ARCHIVE": "Artxibatu",
+		"ARE_YOU_SURE": "Ziur zaude",
+		"BACK": "Atzera",
+		"BCC": "BCC",
+		"CANCEL": "Utzi",
+		"CC": "CC",
+		"CLEAR": "Garbitu",
+		"CLOSE": "Itxi",
+		"CONTACTS": "Kontaktuak",
+		"DELETE": "Ezabatu",
+		"DONE": "Eginda",
+		"EMAIL": "Email",
+		"FROM": "Nork",
+		"LOADING": "Kargatzen",
+		"LOGOUT": "Saioa itxi",
+		"MORE": "Gehiago",
+		"MOVE_TO": "Mugitu",
+		"NAME": "Izena",
+		"NONE": "Bat ere ez",
+		"NOT_SPAM": "Ez da spama",
+		"USERNAME": "Erabiltzaile-izena",
+		"PASSWORD": "Pasahitza",
+		"REPLY_TO": "Erantzun",
+		"SAVE": "Gorde",
+		"SAVE_CHANGES": "Aldaketak gorde?",
+		"SEARCH": "Bilatu",
+		"SPAM": "Spam",
+		"SUBJECT": "Gaia",
+		"TEST": "Probatu",
+		"TO": "Nori",
+		"SERVER_MESSAGE": "Zerbitzariko mezua",
+		"YES": "Bai",
+		"NO": "Ez",
+		"INACTIVE": "Inaktibo"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Login",
+		"LABEL_SIGN_ME": "Gogora nazazu",
+		"BUTTON_SIGN_IN": "Sartu"
+	},
+	"TOP_TOOLBAR": {
+		"BUTTON_ADD_ACCOUNT": "Gehitu kontua",
+		"BUTTON_SETTINGS": "Ezarpenak",
+		"BUTTON_HELP": "Laguntza"
+	},
+	"MOBILE": {
+		"BUTTON_MOBILE_VERSION": "Mugikorreko bertsioa",
+		"BUTTON_DESKTOP_VERSION": "Mahaigaineko bertsioa"
+	},
+	"SEARCH": {
+		"TITLE_ADV": "Bilaketa aurreratua",
+		"TEXT": "Testua",
+		"HAS_ATTACHMENT": "Erantsitako fitxategiak",
+		"FLAGGED": "Markatuta",
+		"UNSEEN": "Irakurri gabe",
+		"DATE": "Data",
+		"DATE_ALL": "Denak",
+		"DATE_3_DAYS": "3 egun arterakoak",
+		"DATE_7_DAYS": "Astebetako arterakoak",
+		"DATE_MONTH": "Hilabete arterakoak",
+		"DATE_3_MONTHS": "3 hilabete arterakoak",
+		"DATE_6_MONTHS": "6 hilabete arterakoak",
+		"DATE_YEAR": "Urtebete arterakoak",
+		"SUBFOLDERS": "Azpikarpetak",
+		"SUBFOLDERS_NONE": "Bat ere ez",
+		"SUBFOLDERS_SUBTREE": "Denak",
+		"SUBFOLDERS_SUBTREE_ONE": "Maila bat",
+		"REPLIED": "Erantzunda",
+		"KEYWORD": "Etiketa"
+	},
+	"FOLDER_LIST": {
+		"BUTTON_COMPOSE": "Idatzi",
+		"BUTTON_NEW_MESSAGE": "Mezu berria",
+		"INBOX_NAME": "Sarrera-ontzia",
+		"SENT_NAME": "Bidalitakoak",
+		"DRAFTS_NAME": "Zirriborroak",
+		"TRASH_NAME": "Zakarrontzia",
+		"ARCHIVE_NAME": "Artxiboa"
+	},
+	"QUOTA": {
+		"TITLE": "Kuota"
+	},
+	"MESSAGE_LIST": {
+		"BUTTON_RELOAD": "Eguneratu mezuen zerrenda",
+		"BUTTON_EMPTY_FOLDER": "Hustu karpeta",
+		"BUTTON_MULTY_FORWARD": "Erantsi bezala bidali",
+		"BUTTON_DELETE_WITHOUT_MOVE": "Beteriako ezabatu",
+		"MENU_SET_SEEN": "Irakurri bezala markatu",
+		"MENU_SET_ALL_SEEN": "Dena irakurri bezala markatu",
+		"MENU_UNSET_SEEN": "Irakurri gabe bezala markatu",
+		"MENU_SET_FLAG": "Markatu",
+		"MENU_UNSET_FLAG": "Desmarkatu",
+		"MENU_SELECT_ALL": "Denak",
+		"MENU_SELECT_INVERT": "Alderantzikatu",
+		"MENU_SELECT_UNSEEN": "Irakurri gabea",
+		"MENU_SELECT_SEEN": "Irakurria",
+		"MENU_SELECT_FLAGGED": "Markatua",
+		"MENU_SELECT_UNFLAGGED": "Markatu gabea",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Deskargatu eranskin guztiak",
+		"EMPTY_LIST": "Hustu zerrenda.",
+		"EMPTY_SEARCH_LIST": "Zure bilaketarekin bat datorren mezurik ez.",
+		"SEARCH_RESULT_FOR": "\"%SEARCH%\"-erako bilaketa emaitzak",
+		"BACK_TO_MESSAGE_LIST": "itzuli mezuen zerrendara",
+		"PUT_MESSAGE_HERE": "Bota mezua hemen zerrendan ikusteko",
+		"TODAY_AT": "gaur %TIME%-etan",
+		"YESTERDAY_AT": "atzo %TIME%-etan",
+		"NEW_MESSAGE_NOTIFICATION": "%COUNT% mezu berri dituzu!",
+		"QUOTA_SIZE": "<strong>%SIZE% (%PROC%%)<\/strong> erabiliz zure <strong>%LIMIT%<\/strong>-tik",
+		"SORT": "Ordenatu",
+		"SORT_DATE_ASC": "Data goraka",
+		"SORT_DATE_DESC": "Data beheraka",
+		"SORT_SIZE_ASC": "Tamaina goraka",
+		"SORT_SIZE_DESC": "Tamaina beheraka",
+		"SORT_SUBJECT_ASC": "Gaia A-Z",
+		"SORT_SUBJECT_DESC": "Gaia Z-A",
+		"SORT_FROM_ASC": "Nork A-Z",
+		"SORT_FROM_DESC": "Nork Z-A"
+	},
+	"MESSAGE": {
+		"BUTTON_EDIT": "Editatu",
+		"BUTTON_UNSUBSCRIBE": "Kendu zerrenda honen harpidetza",
+		"BUTTON_REPLY": "Erantzun",
+		"BUTTON_REPLY_ALL": "Erantzun denei",
+		"BUTTON_FORWARD": "Birbidali",
+		"BUTTON_FORWARD_AS_ATTACHMENT": "Birbidali eranskin moduan",
+		"BUTTON_EDIT_AS_NEW": "Editatu Berri moduan",
+		"BUTTON_SHOW_IMAGES": "Erakutsi kanpoko irudiak",
+		"BUTTON_NOTIFY_READ_RECEIPT": "Bidaltzaileak irakurri duzunean abisua jasotzeko eskatu du.",
+		"BUTTON_IN_NEW_WINDOW": "Ikusi kanpoko leihoan",
+		"BUTTON_THREAD_LIST": "Harien zerrenda",
+		"BUTTON_THREAD_PREV": "Aurrekoa",
+		"BUTTON_THREAD_NEXT": "Hurrengoa",
+		"BUTTON_THREAD_MORE": "Mezu gehiago",
+		"MENU_HEADERS": "Erakutsi mezuen goiburuak",
+		"MENU_VIEW_ORIGINAL": "Erakutsi jatorrizkoa",
+		"HTML_VIEW": "Ikusi HTML mezua",
+		"PLAIN_VIEW": "Ikusi testu soil mezua",
+		"MENU_DOWNLOAD_ORIGINAL": "Deskargatu .eml fitxategi bezala",
+		"MENU_FILTER_SIMILAR": "Iragazi hau bezalako mezuak",
+		"MENU_PRINT": "Inprimatu",
+		"EMPTY_SUBJECT_TEXT": "(Gairik ez)",
+		"LABEL_DATE": "Data",
+		"LABEL_FROM_SHORT": "nork",
+		"LABEL_TO_SHORT": "nori",
+		"PRINT_LABEL_ATTACHMENTS": "Eranskinak",
+		"MESSAGE_VIEW_DESC": "Aukeratu zerrendako edozein mezua hemen ikusteko.",
+		"MESSAGE_VIEW_MOVE_DESC": "Klikatu karpetaren izena ezkerreko panelean helburua aukeratzeko.",
+		"LINK_DOWNLOAD_AS_ZIP": "Deskargatu zip gisa",
+		"SPAM_SCORE": "Spam Puntuzioa",
+		"HAS_VIRUS_WARNING": "KONTUZ: virusa detektatu da",
+		"TAGS": "Etiketak",
+		"NEW_TAG": "Etiketa berria"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Garrantzitsua",
+		"$todo": "Egiteko",
+		"$label1": "Garrantzitsua",
+		"$label2": "Lana",
+		"$label3": "Pertsonala",
+		"$label4": "Egiteko",
+		"$label5": "Beranduago"
+	},
+	"READ_RECEIPT": {
+		"SUBJECT": "Itzultzeko agiria (bistaratua) - %SUBJECT%",
+		"BODY": "%READ-RECEIPT% -ra bidali duzun mezurako Itzultzeko agiria da hau.\n\nNote: \"Itzultzeko agiri honek mezua hartzailearen ordenagailuan agertu dela bakarrik jakinarazten du .\"\nHorrek ez du esan nahi hartzaileak edukia irakurri edota ulertu duenik.\n"
+	},
+	"SUGGESTIONS": {
+		"SEARCHING_DESC": "Bilatzen..."
+	},
+	"CONTACTS": {
+		"TAB_CONTACT": "Kontaktua",
+		"TAB_LOCATIONS": "Kokapenak",
+		"TAB_BUSINESS": "Lantegia",
+		"LABEL_ORGANIZATION": "Erakundea",
+		"LABEL_DEPARTMENT": "Saila",
+		"LABEL_TITLE": "Izenburua",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Galdetu",
+		"NEVER": "Inoiz ez",
+		"ALWAYS": "Beti",
+		"ALWAYS_IF_POSSIBLE": "Beti aukera badago",
+		"BUTTON_ADD_CONTACT": "Gehitu Kontaktua",
+		"BUTTON_CREATE_CONTACT": "Sortu",
+		"BUTTON_UPDATE_CONTACT": "Eguneratu",
+		"BUTTON_IMPORT": "Inportatu (csv, vcf, vCard)",
+		"BUTTON_EXPORT_VCARD": "Esportatu (vcf, vCard)",
+		"BUTTON_EXPORT_CSV": "Esportatu (csv)",
+		"ERROR_IMPORT_FILE": "Inportazio errorea (fitxategi-formatua ez da baliozkoa)",
+		"EMPTY_LIST": "Ez dago kontakturik hemen",
+		"EMPTY_SEARCH": "Ez da kontakturik aurkitu",
+		"CLEAR_SEARCH": "Garbitu bilaketa",
+		"CONTACT_VIEW_DESC": "Aukeratu kontaktua zerrendan hemen ikusteko.",
+		"LABEL_BIRTHDAY": "Urtebetetzea",
+		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Sartu erakusteko izena",
+		"PLACEHOLDER_ENTER_LAST_NAME": "Sartu abizenak",
+		"PLACEHOLDER_ENTER_FIRST_NAME": "Sartu izena",
+		"PLACEHOLDER_ENTER_NICK_NAME": "Sartu ezizena",
+		"LABEL_READ_ONLY": "Irakurtzeko bakarrik",
+		"ADD_MENU_LABEL": "Gehitu",
+		"ADD_MENU_NICKNAME": "Ezizena",
+		"ADD_MENU_NOTE": "Ezizena",
+		"ADD_MENU_PHONE": "Telefonoa",
+		"ADD_MENU_URL": "URL",
+		"ADD_MENU_ADDRESS": "Helbidea",
+		"ADD_MENU_BIRTHDAY": "Urtebetetzea",
+		"ADD_MENU_TAGS": "Etiketak",
+		"BUTTON_SHARE_ALL": "Denak",
+		"BUTTON_SYNC": "Sinkronizazioa (CardDAV)"
+	},
+	"COMPOSE": {
+		"LINK_SHOW_INPUTS": "erakutsi eremu guztiak",
+		"BUTTON_SEND": "Bidali",
+		"BUTTON_MINIMIZE": "Minimizatu",
+		"SAVED_TIME": "%TIME%-n gordea",
+		"SAVED_ERROR_ON_SEND": "Mezua bidali da baina ez da gorde bidalitako elementuen karpetan",
+		"DISCARD_UNSAVED_DATA": "Baztertu gorde gabeko datuak?",
+		"ATTACH_FILES": "Erantsi fitxategiak",
+		"ATTACH_DROP_FILES_DESC": "Arrastatu fitxategiak hona",
+		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% idatzia",
+		"FORWARD_MESSAGE_TOP_TITLE": "-------- Birbidalitako mezua -------",
+		"FORWARD_MESSAGE_TOP_SENT": "Bidalita",
+		"EMPTY_TO_ERROR_DESC": "Mesedez, gehitu gutxienez jasotzaile bat",
+		"NO_ATTACHMENTS_HERE_DESC": "Ez dago eranskinik hemen.",
+		"ATTACHMENTS_ERROR_DESC": "Kontuz! Eranskin guztiak ez dira kargatu.",
+		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Eranskin guztiak ez dira kargatu oraindik.",
+		"ALLOW_SPELLCHECK": "Gaitu nabigatzaileko hizkuntza-zuzentzailea",
+		"BUTTON_REQUEST_READ_RECEIPT": "Eskatu irakurketa-agiria",
+		"BUTTON_MARK_AS_IMPORTANT": "MArkatu garrantzitsu bezala",
+		"BUTTON_REQUEST_DSN": "Eskatu jasotze-agiria"
+	},
+	"POPUPS_ASK": {
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Ziur zaude leiho hau itxi nahi duzula?",
+		"DESC_WANT_DELETE_MESSAGES": "Ziur zaude mezua(k) ezabatu nahi d(it)uzula?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Aukeratu zure hizkuntza"
+	},
+	"POPUPS_ADD_ACCOUNT": {
+		"TITLE_ADD_ACCOUNT": "Kontua gehitu?",
+		"BUTTON_ADD_ACCOUNT": "Gehitu",
+		"TITLE_UPDATE_ACCOUNT": "Kontua eguneratu?",
+		"BUTTON_UPDATE_ACCOUNT": "Eguneratu"
+	},
+	"POPUPS_IDENTITY": {
+		"TITLE_ADD_IDENTITY": "Nortasuna gehitu?",
+		"TITLE_UPDATE_IDENTITY": "Nortasuna eguneratu?",
+		"BUTTON_ADD_IDENTITY": "Gehitu",
+		"BUTTON_UPDATE_IDENTITY": "Eguneratu",
+		"LABEL_SIGNATURE_INSERT_BEFORE": "Txertatu sinadura hau erantzuteko testuaren aurretik"
+	},
+	"POPUPS_CREATE_FOLDER": {
+		"TITLE_CREATE_FOLDER": "Karpeta sortu?",
+		"LABEL_PARENT": "Karpeta gurasoa",
+		"BUTTON_CREATE": "Sortu",
+		"TITLE_CREATING_PROCESS": "Karpeta sortzen"
+	},
+	"POPUPS_CLEAR_FOLDER": {
+		"TITLE_CLEAR_FOLDER": "Ezabatu karpetako mezu guztiak?",
+		"DANGER_DESC_WARNING": "Kontuz!",
+		"DANGER_DESC_HTML_1": "Ekintza honen bidez  <strong>%FOLDER%</strong> karpetako mezu guztiak ezabatuko dira.",
+		"DANGER_DESC_HTML_2": "Behin hasita, ekintza hau ezin da gelditu edo utzi.",
+		"TITLE_CLEARING_PROCESS": "Karpeta garbitzen..."
+	},
+	"OPENPGP": {
+		"POPUP_IMPORT_TITLE": "Inportatu OpenPGP gakoa",
+		"POPUP_IMPORT_BUTTON": "Inportatu",
+		"POPUP_VIEW_TITLE": "Ikusi OpenPGP gakoa",
+		"POPUP_VIEW_BUTTON": "Aukeratu",
+		"POPUP_GENERATE_TITLE": "Sortu OpenPGP gako parea",
+		"POPUP_GENERATE_BUTTON": "Sortu",
+		"LABEL_KEY_TYPE": "Mota",
+		"LABEL_SIGN": "Sinatu",
+		"LABEL_ENCRYPT": "Zifratu",
+		"BUTTON_DECRYPT": "Deszifratu",
+		"BUTTON_VERIFY": "Egiaztatu",
+		"SIGNED_MESSAGE": "OpenPGP sinatutako mezua",
+		"ENCRYPTED_MESSAGE": "OpenPGP zifratutako mezua",
+		"STORE_IN_GNUPG": "Zerbitzarian gorden GnuPG-n",
+		"BACKUP_ON_SERVER": "Zerbitzarian gorde (zifratuta)",
+		"GOOD_SIGNATURE": "%USER%-en sinadura egokia",
+		"ERROR": "OpenPGP errorea: %ERROR%"
+	},
+	"POPUPS_FILTER": {
+		"TITLE_CREATE_FILTER": "Sortu iragazkia?",
+		"TITLE_EDIT_FILTER": "Eguneratu iragazkia?",
+		"LEGEND_CONDITIONS": "Baldintzak",
+		"LEGEND_ACTIONS": "Ekintzak",
+		"BUTTON_ADD_CONDITION": "Gehitu baldintza",
+		"SELECT_ACTION_MOVE_TO": "Mugitu hona",
+		"SELECT_ACTION_FORWARD_TO": "Birbidali honi",
+		"SELECT_ACTION_REJECT": "Errefusatu",
+		"SELECT_ACTION_VACATION_MESSAGE": "Opor mezua",
+		"SELECT_ACTION_DISCARD": "Baztertu",
+		"SELECT_FIELD_RECIPIENTS": "Hartzaileak (Nori edo CC)",
+		"SELECT_FIELD_HEADER": "Goiburua",
+		"SELECT_FIELD_BODY": "Gorputza",
+		"SELECT_FIELD_SIZE": "Tamaina",
+		"SELECT_TYPE_CONTAINS": "Barnean du",
+		"SELECT_TYPE_NOT_CONTAINS": "Barnean ez du",
+		"SELECT_TYPE_MATCHES": "Bat etortzeak (* eta ? onartzen dira)",
+		"SELECT_TYPE_NOT_MATCHES": "Bat ez etortzeak (* eta ? onartzen dira)",
+		"SELECT_TYPE_REGEXP": "Adierazpen erregularra",
+		"SELECT_TYPE_NOT_REGEXP": "Adierazpen erregularra",
+		"SELECT_TYPE_EQUAL_TO": "Berdina",
+		"SELECT_TYPE_NOT_EQUAL_TO": "Desberdina",
+		"SELECT_TYPE_OVER": "Gainean",
+		"SELECT_TYPE_UNDER": "Azpian",
+		"SELECT_TYPE_TEXT": "Testua",
+		"SELECT_TYPE_RAW": "Raw",
+		"SELECT_MATCH_ANY": "Bat etortzeak hurrengo EDOZEIN araurekin",
+		"SELECT_MATCH_ALL": "Bat etortzeak hurrengo arau GUZTIEKIN",
+		"MARK_AS_READ_LABEL": "Markatu irakurri bezala",
+		"REPLY_INTERVAL_LABEL": "Erantzuteko tartea (egunak)",
+		"KEEP_LABEL": "Mantenu",
+		"STOP_LABEL": "Ez geratu arazoak prozesatzeaz",
+		"VACATION_SUBJECT_LABEL": "Gaia (hautazkoa)",
+		"VACATION_MESSAGE_LABEL": "Mezua",
+		"VACATION_RECIPIENTS_LABEL": "Hartzaileak (komaz bananduta)",
+		"REJECT_MESSAGE_LABEL": "Errefusatu mezua",
+		"ALL_INCOMING_MESSAGES_DESC": "Iristen diren mezu guztiak"
+	},
+	"POPUPS_SIEVE_SCRIPT": {
+		"TITLE_CREATE": "Sortu Scripta",
+		"TITLE_EDIT": "Editatu Scripta",
+		"BUTTON_ADD_FILTER": "Gehitu iragazkia",
+		"BUTTON_RAW_SCRIPT": "Erabili erabiltzailearen script pertsonal bat",
+		"CAPABILITY_LABEL": "Gaitasunak",
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "Aldaketa hauek zerbitzarian gorde behar dira."
+	},
+	"POPUPS_SYSTEM_FOLDERS": {
+		"TITLE_SYSTEM_FOLDERS": "Aukeratu sistemaren karpetak",
+		"SELECT_CHOOSE_ONE": "Aukeratu bat",
+		"SELECT_UNUSE_NAME": "Ez erabili",
+	  "NOTIFICATION_SENT": "Ez duzu sistemako \"Bidalitakoak"\ karpeta hautatu mezuak bidali ondoren bertan ipintzeko.\nBidalitako mezua gorde nahi ez baduzu hautatu \"Ez erabili\" aukera.\n",
+		"NOTIFICATION_DRAFTS": "Ez duzu sistemako \"Zirriborroak\"  karpeta hautatu mezuak editatu bitartean gordetzeko.",
+		"NOTIFICATION_SPAM": "Ez duzu sistemako \"Zabor-posta\" karpeta hautatu zabor-mezuak kokatzeko.\nMezu hauek betirako ezabatu nahi badituzu, aukeratu \"Ez erabili\" aukera.\n",
+		"NOTIFICATION_TRASH": "Ez duzu sistemako \"Zakarrontzia\" karpeta hautatu zabor-mezuak kokatzeko.\nMezu hauek betirako ezabatu nahi badituzu, aukeratu \"Ez erabili\" aukera.\n",
+		"NOTIFICATION_ARCHIVE": "Ez duzu sistemako \"Artxiboa\" karpeta hautatu artxibatutako mezuak gordetzeko."
+	},
+	"TITLES": {
+		"MAILBOX": "Sarrera-ontzia",
+		"SETTINGS": "Ezarpenak"
+	},
+	"UPLOAD": {
+		"ERROR_FILE_IS_TOO_BIG": "Fitxategia handiegia da",
+		"ERROR_FILE_PARTIALLY_UPLOADED": "Fitxategia partzialki kargatu da errore ezezagun batengatik",
+		"ERROR_NO_FILE_UPLOADED": "Ez da fitxategirik kargatu",
+		"ERROR_MISSING_TEMP_FOLDER": "Fitxategi tenporala falta da",
+		"ERROR_ON_SAVING_FILE": "Fitxategi-kargako errore ezezagun bat gertatu da",
+		"ERROR_FILE_TYPE": "Ez baliozko fitxategi-mota",
+		"ERROR_UNKNOWN": "Fitxategi-kargako errore ezezagun bat gertatu da"
+	},
+	"EDITOR": {
+		"TEXT_SWITCHER_PLAIN_TEXT": "HTML <-> TESTUA",
+		"TEXT_SWITCHER_SOURCE": "HTML <-> JATORRIA"
+	},
+	"SETTINGS_LABELS": {
+		"LABEL_PERSONAL_NAME": "Pertsonala",
+		"LABEL_GENERAL_NAME": "Orokorra",
+		"LABEL_CONTACTS_NAME": "Kontaktuak",
+		"LABEL_FOLDERS_NAME": "Karpetak",
+		"LABEL_ACCOUNTS_NAME": "Kontuak",
+		"LABEL_FILTERS_NAME": "Iragazkiak",
+		"LABEL_SECURITY_NAME": "Segurtasuna",
+		"LABEL_THEMES_NAME": "Gaiak"
+	},
+	"SETTINGS_FILTERS": {
+		"LEGEND_FILTERS": "Iragazkiak",
+		"SIMPLE": "Arrunta",
+		"ADVANCED": "Aurretatua",
+		"BUTTON_ADD_SCRIPT": "Gehitu Scripta",
+		"SUBNAME_MOVE_TO": "Mugitu \"%FOLDER%\"-era",
+		"SUBNAME_FORWARD_TO": "Birbidali \"%EMAIL%\"-era",
+		"SUBNAME_REJECT": "Errefusatu",
+		"SUBNAME_VACATION_MESSAGE": "Opor-mezua",
+		"SUBNAME_DISCARD": "Baztertu"
+	},
+	"SETTINGS_SECURITY": {
+		"LEGEND_SECURITY": "Segurtasuna",
+		"LABEL_AUTOLOGOUT": "Saioa automatikoki itxi",
+		"AUTOLOGIN_NEVER_OPTION_NAME": "Inoiz",
+		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minututan",
+		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% ordutan"
+	},
+	"SETTINGS_GENERAL": {
+		"LEGEND_GENERAL": "Orokorra",
+		"LANGUAGE": "Hizkuntza",
+		"IDENTITY": "Nortasuna",
+		"LAYOUT": "Diseinua",
+		"LAYOUT_NO_SPLIT": "Zatitu gabe",
+		"LAYOUT_VERTICAL_SPLIT": "Zatiketa bertikala",
+		"LAYOUT_HORIZONTAL_SPLIT": "Zatiketa horizontala",
+		"EDITOR": "Berezko testu editorea",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Formaturik gabea",
+		"VIEW_OPTIONS": "Ikusteko aukerak",
+		"USE_PREVIEW_PANE": "Erabili aurreikusteko panela",
+		"HIDE_DELETED_MESSAGES": "Ezkutatu ezabatzeko markatutako mezuak",
+		"USE_CHECKBOXES_IN_LIST": "Bistaratu kontrol laukiak zerrendan",
+		"USE_THREADS": "Erabili hariak",
+		"REPLY_SAME_FOLDER": "Kokatu erantzunak erantzundako mezuaren karpeta berean",
+		"SHOW_IMAGES": "Erakusti beti kanpoko irudiak mezuaren gorputzean",
+		"PREFER_HTML": "Lehenetsi HTMLa testu arruntari",
+		"PREFER_HTML_INFO": "Mezuak batzuetan bi formatuetan datoz. Aukera honekin HTML edo testu arrunt partea erakustea aukera dezakezu.",
+		"REMOVE_COLORS": "Kendu atzealdeko irudia eta testuaren kolorean mezuaren gorputzetik",
+		"MESSAGE_PER_PAGE": "Orrialdeko mezuak",
+		"MARK_MESSAGE_READ_AFTER": "Markatu mezua irakurrita ondoren",
+		"MSG_DEFAULT_ACTION": "Lehenetsitako ekintza",
+		"SECONDS": "segundu",
+		"NOTIFICATIONS": "Jakinarazpenak",
+		"SOUND_NOTIFICATION": "Soinu-jakinarazpena",
+		"CHROME_NOTIFICATION_DESC": "Erakutsi mezu berrien jakinarazpen popup-ak",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Nabigatzaileak blokeatuta)",
+		"LIST_INLINE_ATTACHMENTS": "Erakutsi sareko eranskinak zerrendan",
+		"LIST_SIMPLE_ATTACHMENTS": "Eranskinen zerrenda arrunta"
+	},
+	"SETTINGS_CONTACTS": {
+		"LABEL_CONTACTS_AUTOSAVE": "Automatikoki gehitu hartzaileak helbide-liburura",
+		"LEGEND_CONTACTS_SYNC": "Urruneko Sinkronizazioa (CardDAV)",
+		"LABEL_CONTACTS_SYNC_ENABLE": "Gaitu urruneko sinkronizazioa",
+		"LABEL_CONTACTS_SYNC_SERVER": "Zerbitzaria",
+		"LABEL_CONTACTS_SYNC_AB_URL": "Helbide-liburuaren URL-a",
+		"LABEL_CONTACTS_SYNC_USER": "Erabiltzailea",
+		"SYNC_READ": "Irakurtzeko soilik"
+	},
+	"SETTINGS_THEMES": {
+		"LEGEND_THEMES": "Gaiak",
+		"LABEL_BACKGROUND": "Atzealdeko irudiak",
+		"LABEL_FONTS": "Letra-tipoak",
+		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Kargatu atzealdeko irudia (JPG, PNG)",
+		"ERROR_FILE_IS_TOO_BIG": "Fitxategia handiegia da",
+		"ERROR_FILE_TYPE_ERROR": "Ez-baliozko fitxategi-mota (JPG eta PNG soilik)",
+		"ERROR_UNKNOWN": "Fitxategi-karga errore ezezagun bat gertatu da"
+	},
+	"SETTINGS_FOLDERS": {
+		"LEGEND_FOLDERS": "Karpeta Zerrenda",
+		"BUTTON_CREATE": "Sortu Karpeta",
+		"BUTTON_SYSTEM": "Sistemak Karpetak",
+		"BUTTON_SUBSCRIBE": "Harpidetu",
+		"BUTTON_UNSUBSCRIBE": "Harpidetza kendu",
+		"LOADING_PROCESS": "Karpeta zerrenda eguneratzen",
+		"CREATING_PROCESS": "Karpeta sortzen",
+		"DELETING_PROCESS": "Karpeta ezabatzen",
+		"RENAMING_PROCESS": "Karpeta berrizendatzen",
+		"TO_MANY_FOLDERS_DESC_1": "Karpeta gehiegi dituzu!",
+		"TO_MANY_FOLDERS_DESC_2": "Beraien zati bat bakarrik erakutsi dugu, errendimendu arazoak saihesteko.",
+		"HELP_DELETE_FOLDER": "Ezabatu karpeta",
+		"HELP_SHOW_HIDE_FOLDER": "Erakutsi\/ezkutatu karpeta",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Bilatu\/ez bilatu mezu berriak",
+		"HIDE_UNSUBSCRIBED": "Ezkutatu harpidetzik gabeko karpetak",
+		"UNHIDE_KOLAB_FOLDERS": "Erakutsi Kolab karpetak",
+		"TYPE_CALENDAR": "Egutegia",
+		"TYPE_CONFIGURATION": "Ezarpenak",
+		"TYPE_CONTACTS": "Kontaktuak",
+		"TYPE_FILES": "Fitxategiak",
+		"TYPE_JOURNAL": "Egunerokoa",
+		"TYPE_NOTES": "Oharrak",
+		"TYPE_TASKS": "Atazak"
+	},
+	"SETTINGS_ACCOUNTS": {
+		"LEGEND_ACCOUNTS": "Kontuak",
+		"LEGEND_IDENTITIES": "Nortasunak",
+		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Kontuak eta Nortasunak",
+		"BUTTON_ADD_ACCOUNT": "Gehitu kontu bat",
+		"BUTTON_ADD_IDENTITY": "Gehitu identitate bat",
+		"LOADING_PROCESS": "Eguneratzen...",
+		"DEFAULT_IDENTITY_LABEL": "lehenetsia"
+	},
+	"SETTINGS_OPENPGP": {
+		"BUTTON_IMPORT_KEY": "Inportatu Gakoa",
+		"BUTTON_GENERATE_KEY_PAIR": "Sortu Gako Parea",
+		"TITLE_PRIVATE": "Pribatua",
+		"TITLE_PUBLIC": "Publikoa",
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatikoi gorde zirriborroa",
+		"GET_MAILVELOPE": "Lortu Mailvelope nabigatzaileko gehigarria."
+	},
+	"SHORTCUTS_HELP": {
+		"LEGEND_SHORTCUTS_HELP": "Laster-teklen laguntza",
+		"TAB_MAILBOX": "Sarrera-ontzia",
+		"TAB_MESSAGE_LIST": "Mezuen zerrenda",
+		"TAB_MESSAGE_VIEW": "Mezuen ikuspegia",
+		"TAB_COMPOSE": "Prestatu",
+		"LABEL_OPEN_USER_DROPDOWN": "Ireki erabiltzailearen goitibeherako menua",
+		"LABEL_REPLY": "Erantzun",
+		"LABEL_REPLY_ALL": "Erantzun Denei",
+		"LABEL_FORWARD": "Birbidali",
+		"LABEL_FORWARD_MULTIPLY": "Birbidali eranskin moduan",
+		"LABEL_HELP": "Laguntza",
+		"LABEL_CHECK_ALL": "Aukeratu mezu guztiak",
+		"LABEL_DELETE": "Ezabatu",
+		"LABEL_OPEN_THREAD": "Ireki aukeratutako haria",
+		"LABEL_MOVE": "Mugitu",
+		"LABEL_READ": "Irakurri aukeratutako mezuak",
+		"LABEL_UNREAD": "Ez irakurri aukeratutako mezuak",
+		"LABEL_IMPORTANT": "Garrantzitsua, markatu aukeratutako mezuak",
+		"LABEL_CANCEL_SEARCH": "Ezeztatu bilaketa",
+		"LABEL_FULLSCREEN_ENTER": "Pantaila osoa (aurrebista panelaarekin)",
+		"LABEL_VIEW_MESSAGE_ENTER": "Ikusi mezua (aurrebista panelik gabe)",
+		"LABEL_SWITCH_TO_MESSAGE": "Fokuratu hautatutako mezua",
+		"LABEL_SWITCH_TO_FOLDER_LIST": "Fokuratu hautatutako mezua",
+		"LABEL_FULLSCREEN_TOGGLE": "Aldatu pantaila osoko modua",
+		"LABEL_BLOCKQUOTES_TOGGLE": "Aldatu mezuen aipuak",
+		"LABEL_THREAD_NEXT": "Hariko hurrengo mezua",
+		"LABEL_THREAD_PREV": "Hariko aurreko mezua",
+		"LABEL_EXIT_FULLSCREEN": "Irten pantaila osoko modutik",
+		"LABEL_CLOSE_MESSAGE": "Itxi mezua (aurrebista panelik gabe)",
+		"LABEL_SWITCH_TO_LIST": "Itzuli fokua mezuen zerrendara",
+		"LABEL_OPEN_COMPOSE_POPUP": "Ireki prestatzeko popup-a",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "Txikitu prestatzeko popup-a",
+		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Ireki identitateen goitibeherako menua,
+		"LABEL_SAVE_MESSAGE": "Gorde mezua",
+		"LABEL_SEND_MESSAGE": "Bidali mezua",
+		"LABEL_CLOSE_COMPOSE": "Itxi mezua"
+	},
+	"NOTIFICATIONS": {
+		"REQUEST_ERROR": "Eskaerak huts egin du",
+		"REQUEST_ABORTED": "Eskaera bertan behera utzi da",
+		"REQUEST_TIMEOUT": "Eskaera denboraz kantpo",
+		"INVALID_TOKEN": "Ez-baliozko tokena",
+		"AUTH_ERROR": "Autentikazio errorea",
+		"CONNECTION_ERROR": "Ezin da zerbitzarira konektatu",
+		"DOMAIN_ALREADY_EXISTS": "Domeinua jadanik existitzen da",
+		"DOMAIN_NOT_ALLOWED": "Domeinu ez baimendua",
+		"ACCOUNT_NOT_ALLOWED": "Kontu ez baimendua",
+		"CONTACTS_SYNC_ERROR": "Kontaktu sinkronizazio errorea",
+		"CANT_GET_MESSAGE_LIST": "Ezin da mezuen zerrenda eskuratu",
+		"CANT_GET_MESSAGE": "Ezin da mezua eskuratu",
+		"CANT_DELETE_MESSAGE": "Ezin da mezua ezabatu",
+		"CANT_COPY_MESSAGE": "Ezin da mezua kopiatu",
+		"CANT_MOVE_MESSAGE": "Ezin da mezua mugitu",
+		"CANT_SAVE_MESSAGE": "Ezin da mezua gorde",
+		"CANT_SEND_MESSAGE": "Ezin da mezua bidali",
+		"INVALID_RECIPIENTS": "Ez-baliozko hartzaileak",
+		"CANT_SAVE_FILTERS": "Ezin dira iragazkiak gorde",
+		"CANT_GET_FILTERS": "Ezin dira iragazkiak eskuratu",
+		"CANT_ACTIVATE_FILTERS_SCRIPT": "Ezin dira iragazki-scriptak aktibatu",
+		"CANT_DELETE_FILTERS_SCRIPT": "Ezin dira iragazki-scriptak ezabatu",
+		"FILTERS_ARE_NOT_CORRECT": "Iragazkiak ez dira zuzenak",
+		"CANT_CREATE_FOLDER": "Ezin da karpeta sortu",
+		"CANT_RENAME_FOLDER": "Ezin da karpeta berrizendatu",
+		"CANT_DELETE_FOLDER": "Ezin da karpeta ezabatu",
+		"CANT_DELETE_NON_EMPTY_FOLDER": "Ezin da hutsi ez dagoen direktorioa ezabatu",
+		"CANT_SUBSCRIBE_FOLDER": "Ezin da karpetara harpidetu",
+		"CANT_UNSUBSCRIBE_FOLDER": "Ezin da karpetatik harpidetza kendu",
+		"DEMO_SEND_MESSAGE_ERROR": "Segurtasunagatik, kontua honek ezin du kanpoko e-mail helbideetara mezurik bidali!",
+		"DEMO_ACCOUNT_ERROR": "Segurtasunagatik, kontu hau ez dago ahalbideratuta ekintza honetarako!",
+		"ACCOUNT_ALREADY_EXISTS": "Kontua jada existitzen da",
+		"ACCOUNT_DOES_NOT_EXIST": "Kontua ez da existitzen",
+		"ACCOUNT_SWITCH_FAILED": "\"%EMAIL%\" kontura aldaketak akatsa eman du",
+		"MAIL_SERVER_ERROR": "Errore bat gertatu da posta zebritzarira sartzean",
+		"INVALID_INPUT_ARGUMENT": "Ez-naliozko sarrera-argumentua",
+		"UNKNOWN_ERROR": "Errore ezezaguna"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
index 19a2179fb..e99b706a9 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "گذرواژه فعلی",
 		"LABEL_NEW_PASSWORD": "گذرواژه جدید",
 		"LABEL_REPEAT_PASSWORD": "تکرار",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "به بررسی گواهینامه SSL نیاز داشته باشد (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "به بررسی گواهینامه SSL نیاز داشته باشد",
 		"LABEL_ALLOW_SELF_SIGNED": "به گواهی‌نامه‌هایی که توسط خودشان امضاء شده‌اند اجازه بده"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "آزمایشی",
-		"UNSTABLE": "ناپایدار",
 		"WARNING": "هشدار!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/user.json b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
index d32a5d5d8..e4f8f09c3 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "خوانده",
 		"MENU_SELECT_FLAGGED": "پرچم‌دار کردن",
 		"MENU_SELECT_UNFLAGGED": "پرچم‌دار نشده",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "فهرست خالی",
 		"EMPTY_SEARCH_LIST": "پیامی مطابق جستجوی شما پیدا نشد",
 		"SEARCH_RESULT_FOR": "نتایج جستجو مطابق \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "هیچ پیوستی اینجا وجود ندارد.",
 		"ATTACHMENTS_ERROR_DESC": "اخطار! همه پیوست‌ها هنوز بارگذاری نشده است.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "همه پیوست‌ها هنوز بارگذاری نشده است.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "درخواست دریافت رسید خواندن",
 		"BUTTON_MARK_AS_IMPORTANT": "علامت زدن به عنوان مهم",
 		"BUTTON_REQUEST_DSN": "درخواست دریافت رسید تحویل درمقصد"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "آگاه‌سازی با صدا",
 		"CHROME_NOTIFICATION_DESC": "پنجره اعلان دریافت پیام جدید را نمایش بده",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(مسدود شده توسط مرورگر)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "اطلاعات تماس گیرندگان را بصورت خودکار در آدرس‌بوک ذخیره کن",
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
index 34fe578c3..2b85e658f 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Nykyinen salasana",
 		"LABEL_NEW_PASSWORD": "Uusi salasana",
 		"LABEL_REPEAT_PASSWORD": "Toista",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Vaadi SSL sertifikaatin varmistus (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Vaadi SSL sertifikaatin varmistus",
 		"LABEL_ALLOW_SELF_SIGNED": "Salli itse-allekirjoitetut sertifikaatit"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "epävakaa",
 		"WARNING": "Varoitus!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/user.json b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
index 8f06084f2..92150c335 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Luetut",
 		"MENU_SELECT_FLAGGED": "Merkityt",
 		"MENU_SELECT_UNFLAGGED": "Merkkaamattomat",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tyhjä lista",
 		"EMPTY_SEARCH_LIST": "Yhtään viestiä ei löytynyt ehdoillasi.",
 		"SEARCH_RESULT_FOR": "Hakutulokset haulle \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Ei liitteitä",
 		"ATTACHMENTS_ERROR_DESC": "Huom! Yhtään liitetiedostoa ei ole ladattu.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Kaikkia liitetiedostoja ei ole vielä ladattu.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Pyydä kuittaus",
 		"BUTTON_MARK_AS_IMPORTANT": "Merkitse tärkeäksi",
 		"BUTTON_REQUEST_DSN": "Pyydä toimituskuittaus"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Äänimerkit",
 		"CHROME_NOTIFICATION_DESC": "Näytä uusien viestien ponnahdusikkuna",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Estetty selaimessa)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Lisää yhetystieto automaattisesti osoitekirjaan",
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
index 21e3e7aca..e9ad33ff5 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Mot de passe actuel",
 		"LABEL_NEW_PASSWORD": "Nouveau mot de passe",
 		"LABEL_REPEAT_PASSWORD": "Répéter",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "S'assurer qu'un certificat SSL (IMAP\/SMTP) est utilisé",
+		"LABEL_REQUIRE_VERIFICATION": "S'assurer qu'un certificat SSL est utilisé",
 		"LABEL_ALLOW_SELF_SIGNED": "Autoriser les certificats auto-signés"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "bêta",
-		"UNSTABLE": "instable",
 		"WARNING": "ATTENTION !"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/user.json b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
index 40623c5ad..df31762ba 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Lu",
 		"MENU_SELECT_FLAGGED": "Signalés",
 		"MENU_SELECT_UNFLAGGED": "Non signalés",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Liste vide.",
 		"EMPTY_SEARCH_LIST": "Aucun message ne correspond à votre recherche.",
 		"SEARCH_RESULT_FOR": "Résultats de recherche pour \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Aucune pièce jointe.",
 		"ATTACHMENTS_ERROR_DESC": "Attention ! Toutes les pièces jointes n'ont pas été téléchargées.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Toutes les pièces jointes n'ont pas encore été téléchargées",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Demander une confirmation de lecture",
 		"BUTTON_MARK_AS_IMPORTANT": "Marquer comme important",
 		"BUTTON_REQUEST_DSN": "Demander un accusé de réception"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Son de notification",
 		"CHROME_NOTIFICATION_DESC": "Afficher un pop-up de notification pour les nouveaux messages",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqué par le navigateur)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Ajouter automatiquement les destinataires à votre carnet d'adresses",
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
index 23ad3f153..8ee5e0f3d 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Jelenlegi jelszó",
 		"LABEL_NEW_PASSWORD": "Új jelszó",
 		"LABEL_REPEAT_PASSWORD": "Újra",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "A használt (IMAP\/SMTP) tanúsítvány ellenőrzés megkövetelése",
+		"LABEL_REQUIRE_VERIFICATION": "A használt tanúsítvány ellenőrzés megkövetelése",
 		"LABEL_ALLOW_SELF_SIGNED": "Saját aláírt tanúsítványok engedélyezése"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "béta",
-		"UNSTABLE": "instabil",
 		"WARNING": "Figyelmeztetés!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/user.json b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
index 75a4b897a..c1d4085e3 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Olvasott",
 		"MENU_SELECT_FLAGGED": "Megjelölt",
 		"MENU_SELECT_UNFLAGGED": "Jelöletlen",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Lista üres.",
 		"EMPTY_SEARCH_LIST": "Nincs a keresésnek megfelelő levél.",
 		"SEARCH_RESULT_FOR": "Keresési eredmények ehhez: \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Nincsenek mellékletek.",
 		"ATTACHMENTS_ERROR_DESC": "Figyelem! Még nem lett feltöltve minden melléklet.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Még nem lett feltöltve minden melléklet.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Olvasási visszaigazolás kérése",
 		"BUTTON_MARK_AS_IMPORTANT": "Megjelölés fontosként",
 		"BUTTON_REQUEST_DSN": "Továbbítási visszaigazolás kérés"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Hangos értesítés",
 		"CHROME_NOTIFICATION_DESC": "Új üzenetek értesítő ablakainak megjelenítése",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(a böngésző blokkolta)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Címzettek automatikus hozzáadása a címtárhoz",
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/admin.json b/snappymail/v/0.0.0/app/localization/id-ID/admin.json
index 78ff4b86e..80b5658d6 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/admin.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Password saat ini",
 		"LABEL_NEW_PASSWORD": "Password baru",
 		"LABEL_REPEAT_PASSWORD": "Ulangi",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Diperlukan verifikasi sertifikat SSL dengan (IMAP\/SMTP) ",
+		"LABEL_REQUIRE_VERIFICATION": "Diperlukan verifikasi sertifikat SSL dengan",
 		"LABEL_ALLOW_SELF_SIGNED": "Izinkan sertifikat yang dibuat sendiri"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "Tidak stabil",
 		"WARNING": "Peringatan!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/user.json b/snappymail/v/0.0.0/app/localization/id-ID/user.json
index 7e6def5d2..27751d2a6 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/user.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Dibaca",
 		"MENU_SELECT_FLAGGED": "Ditandai",
 		"MENU_SELECT_UNFLAGGED": "Jangan tandai",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Daftar kosong",
 		"EMPTY_SEARCH_LIST": "Tidak ada pesan yang sesuai dengan pencarian",
 		"SEARCH_RESULT_FOR": "Hasil pencarian untuk \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Tidak ada lampiran",
 		"ATTACHMENTS_ERROR_DESC": "Peringatan! belum semua lampiran terunggah.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Belum semua lampiran terunggah.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Minta pemberitahuan telah dibaca",
 		"BUTTON_MARK_AS_IMPORTANT": "Tandai sebagai pesan penting",
 		"BUTTON_REQUEST_DSN": "Minta pemberitahuan berhasil kirim"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Notifikasi suara",
 		"CHROME_NOTIFICATION_DESC": "Tampilkan jendela sembul notifikasi pesan",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(diblokir oleh browser)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Tambah penerima ke daftar alamat secara otomatis",
diff --git a/snappymail/v/0.0.0/app/localization/is-IS/user.json b/snappymail/v/0.0.0/app/localization/is-IS/user.json
index 0d17a0647..89d3f163a 100644
--- a/snappymail/v/0.0.0/app/localization/is-IS/user.json
+++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Lesið",
 		"MENU_SELECT_FLAGGED": "Flaggað",
 		"MENU_SELECT_UNFLAGGED": "Afflaggað",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tómur listi.",
 		"EMPTY_SEARCH_LIST": "Engin skilaboð stemmdu við leitina þína.",
 		"SEARCH_RESULT_FOR": "Leitarniðurstöður fyrir \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Engin viðhengi hér.",
 		"ATTACHMENTS_ERROR_DESC": "Aðvörun! Ekki er búið að senda inn öll viðhengi.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ekki er búið að senda inn öll viðhengi.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Biðja um staðfestingu á lestri",
 		"BUTTON_MARK_AS_IMPORTANT": "Merkja sem mikilvægt",
 		"BUTTON_REQUEST_DSN": "Biðja um staðfestingu á afhendingu"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Tilkynningarhljóð",
 		"CHROME_NOTIFICATION_DESC": "Sýna tilkynningarglugga fyrir ný skilaboð",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Lokað af vafra)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Bæta viðtakendum sjálfkrafa í nafnaskrá",
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/admin.json b/snappymail/v/0.0.0/app/localization/it-IT/admin.json
index 19d598789..e39a6a3b1 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Current password",
 		"LABEL_NEW_PASSWORD": "New password",
 		"LABEL_REPEAT_PASSWORD": "Repeat",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate used (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate used",
 		"LABEL_ALLOW_SELF_SIGNED": "Allow self signed certificates"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "unstable",
 		"WARNING": "Warning!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/user.json b/snappymail/v/0.0.0/app/localization/it-IT/user.json
index ac9a228e0..0130c254f 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/user.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Letti",
 		"MENU_SELECT_FLAGGED": "Preferiti",
 		"MENU_SELECT_UNFLAGGED": "Non preferiti",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Lista vuota",
 		"EMPTY_SEARCH_LIST": "Nessun messaggio corrisponde alla tua ricerca",
 		"SEARCH_RESULT_FOR": "Risultati di ricerca per \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Nessun allegato.",
 		"ATTACHMENTS_ERROR_DESC": "Attenzione! Non tutti gli allegati sono stati caricati.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Non tutti gli allegati sono stati caricati al momento.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Richiedi conferma di lettura",
 		"BUTTON_MARK_AS_IMPORTANT": "Marca come importante",
 		"BUTTON_REQUEST_DSN": "Richiedi conferma del ricevimento"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Notifica sonora",
 		"CHROME_NOTIFICATION_DESC": "Mostra le notifiche in caso di nuovi messaggi",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloccate dal browser)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Aggiungi automaticamente le persone che ti inviano mail alla rubrica",
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
index 053c12aa8..6ac59661c 100644
--- a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "現在のパスワード",
 		"LABEL_NEW_PASSWORD": "新しいパスワード",
 		"LABEL_REPEAT_PASSWORD": "再入力",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "(IMAP\/SMTP)のSSL証明書の検証を有効にする",
+		"LABEL_REQUIRE_VERIFICATION": "のSSL証明書の検証を有効にする",
 		"LABEL_ALLOW_SELF_SIGNED": "自己署名証明書を使う"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "unstable",
 		"WARNING": "警告！"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/user.json b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
index e734953b0..d5d161c88 100644
--- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "既読",
 		"MENU_SELECT_FLAGGED": "フラグ付き",
 		"MENU_SELECT_UNFLAGGED": "フラグなし",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "メッセージはありません",
 		"EMPTY_SEARCH_LIST": "検索条件に一致するメールは見つかりませんでした。高度な検索を試してみてください。",
 		"SEARCH_RESULT_FOR": "\"%SEARCH%\"の検索結果",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "添付ファイルがありません",
 		"ATTACHMENTS_ERROR_DESC": "警告！すべての添付ファイルがアップロードされているわけではありません。",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "すべての添付ファイルがアップロードされているわけではありません。",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "開封確認を要求する",
 		"BUTTON_MARK_AS_IMPORTANT": "重要フラグをつける",
 		"BUTTON_REQUEST_DSN": "配信確認を要求する"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "サウンド通知",
 		"CHROME_NOTIFICATION_DESC": "新しいメッセージを受信したらポップアップで知らせる",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(ブラウザでブロックされています)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "返信したアドレスをアドレス帳へ自動的に追加する",
diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/user.json b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
index f64da5983..39f8d2e61 100644
--- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "읽음",
 		"MENU_SELECT_FLAGGED": "중요",
 		"MENU_SELECT_UNFLAGGED": "일반",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "목록이 비어있습니다.",
 		"EMPTY_SEARCH_LIST": "검색 조건에 맞는 결과가 없습니다..",
 		"SEARCH_RESULT_FOR": "\"%SEARCH%\"에 대한 검색 결과",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "첨부된 파일이 없습니다.",
 		"ATTACHMENTS_ERROR_DESC": "경고! 모든 첨부파일이 업로드 되지 않습니다.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "첨부파일이 아직 업로드되지 않았습니다.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "수신 확인 요청",
 		"BUTTON_MARK_AS_IMPORTANT": "중요 표시",
 		"BUTTON_REQUEST_DSN": "수신 확인 요청"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "소리 알림",
 		"CHROME_NOTIFICATION_DESC": "새 메시지 알림 팝업 사용",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(브라우저에 의해 차단됨)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "수신인을 주소록에 자동으로 추가",
diff --git a/snappymail/v/0.0.0/app/localization/langs.json b/snappymail/v/0.0.0/app/localization/langs.json
index bf0ac8dc7..7d530d501 100644
--- a/snappymail/v/0.0.0/app/localization/langs.json
+++ b/snappymail/v/0.0.0/app/localization/langs.json
@@ -14,6 +14,7 @@
 		"es-ES": "Español (España)",
 		"es-LA": "Español (América Latina)",
 		"et-EE": "Eesti",
+		"eu": "Euskara",
 		"fa-IR": "‏فارسی‏",
 		"fi-FI": "Suomi",
 		"fr-CA": "Français (Canada)",
@@ -60,6 +61,7 @@
 		"es-ES": "Spanish (Spain)",
 		"es-LA": "Spanish (Latin America)",
 		"et-EE": "Estonian",
+		"eu": "Basque",
 		"fa-IR": "Persian",
 		"fi-FI": "Finnish",
 		"fr-CA": "French (Canada)",
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
index 365ce8a1d..00cce1e37 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Dabartinis slaptažodis",
 		"LABEL_NEW_PASSWORD": "Naujas slaptažodis",
 		"LABEL_REPEAT_PASSWORD": "Pakartokite",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Reikalauti SSL sertifikato (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Reikalauti SSL sertifikato",
 		"LABEL_ALLOW_SELF_SIGNED": "Leisti pačių sukurtus sertifikatus"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "nestabilus",
 		"WARNING": "Dėmesio!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/user.json b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
index a1a40a4e1..ce340eb26 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Skaityta",
 		"MENU_SELECT_FLAGGED": "Pažymėta",
 		"MENU_SELECT_UNFLAGGED": "Nepažymėta",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tuščias sąrašas.",
 		"EMPTY_SEARCH_LIST": "Nėra pranešimų, atitinkančių jūsų paiešką.",
 		"SEARCH_RESULT_FOR": "Ieškoti \"%SEARCH%\" rezultatuose",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Nėra priedų.",
 		"ATTACHMENTS_ERROR_DESC": "Dėmesio! Ne visi priedai buvo įkelti.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Dar ne visi priedai buvo įkelti",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Prašyti pranešti kada bus perskaitytas",
 		"BUTTON_MARK_AS_IMPORTANT": "Žymėti svarbiu",
 		"BUTTON_REQUEST_DSN": "Prašyti laiško gavimo pažymos"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Garsinis pranešimas",
 		"CHROME_NOTIFICATION_DESC": "Rodyti iššokančius pranešimus apie naujas žinutes",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Blokuoja naršyklė)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatiškai pridėti gavėjus į adresų knygą",
diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/user.json b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
index 66e11b595..6a8d5d474 100644
--- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Izlasīts",
 		"MENU_SELECT_FLAGGED": "Atzīmētie",
 		"MENU_SELECT_UNFLAGGED": "Noņemtās atzīmes",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tukšs saraksts.",
 		"EMPTY_SEARCH_LIST": "Neviens ziņojums neatbilda jūsu meklētajiem kritērijiem.",
 		"SEARCH_RESULT_FOR": "Meklēšanas rezultāti: \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Sound notification",
 		"CHROME_NOTIFICATION_DESC": "Rādīt jaunus paziņojumus kā izlecošus logus",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Parlūkprogramma bloķēja)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatically add recipients to your address book",
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
index 54d6f5b6e..cd86c17b4 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Gjeldende passord",
 		"LABEL_NEW_PASSWORD": "Nytt passord",
 		"LABEL_REPEAT_PASSWORD": "Gjenta",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Krev bekreftelse av SSL-sertifikat (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Krev bekreftelse av SSL-sertifikat",
 		"LABEL_ALLOW_SELF_SIGNED": "Tillat selvutstedt sertifikat"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "ustabil",
 		"WARNING": "Advarsel!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/user.json b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
index cf6381960..f1302a641 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Lest",
 		"MENU_SELECT_FLAGGED": "Stjernemerket",
 		"MENU_SELECT_UNFLAGGED": "Ikke stjernemerket",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tom liste",
 		"EMPTY_SEARCH_LIST": "Søket ga ingen treff.",
 		"SEARCH_RESULT_FOR": "Søketreff for «%SEARCH%»",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Ingen vedlegg.",
 		"ATTACHMENTS_ERROR_DESC": "Advarsel: ett eller flere vedlegg er ikke blitt lastet opp enda.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ett eller flere vedlegg er ikke blitt lastet opp enda",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Be om en bekreftelse fra mottaker på at meldinga er lest",
 		"BUTTON_MARK_AS_IMPORTANT": "Marker som viktig",
 		"BUTTON_REQUEST_DSN": "Be om leveringsbekreftelse"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Lydvarsel",
 		"CHROME_NOTIFICATION_DESC": "Vis sprettopp-varsel om nye meldinger",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(blokkert av nettleser)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Legg til mottakere i adresseboka automatisk",
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
index 6b3c37ab8..0a501d1cf 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Huidig wachtwoord",
 		"LABEL_NEW_PASSWORD": "Nieuw wachtwoord",
 		"LABEL_REPEAT_PASSWORD": "Herhaal nieuw wachtwoord",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Verificatie van SSL certificaten (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Verificatie van SSL certificaten",
 		"LABEL_ALLOW_SELF_SIGNED": "Sta zelf ondertekende certificaten toe"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "bèta",
-		"UNSTABLE": "onstabiel",
 		"WARNING": "Waarschuwing!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
index b7fce299d..43f7c32e0 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Gelezen",
 		"MENU_SELECT_FLAGGED": "Met Vlag",
 		"MENU_SELECT_UNFLAGGED": "Zonder Vlag",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Geen berichten",
 		"EMPTY_SEARCH_LIST": "Geen items gevonden",
 		"SEARCH_RESULT_FOR": "Zoekresultaten voor \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Er zijn geen bijlagen",
 		"ATTACHMENTS_ERROR_DESC": "Waarschuwing! Nog niet alle bijlagen zijn klaar met uploaden",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Toevoegen van bijlage(n) is nog niet gereed",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Leesbevestiging vragen",
 		"BUTTON_MARK_AS_IMPORTANT": "Markeer als belangrijk",
 		"BUTTON_REQUEST_DSN": "Ontvangstbevestiging vragen"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Notificatie geluid",
 		"CHROME_NOTIFICATION_DESC": "Toon nieuwe berichten popup",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Geblokkeerd door de browser)",
-		"LIST_INLINE_ATTACHMENTS": "Toon inline bijlagen in lijst"
+		"LIST_INLINE_ATTACHMENTS": "Toon inline bijlagen in lijst",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatisch ontvangers toevoegen aan uw adresboek",
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
index c8ff827a2..e23df2592 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Bieżące hasło",
 		"LABEL_NEW_PASSWORD": "Nowe hasło",
 		"LABEL_REPEAT_PASSWORD": "Powtórz hasło",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Wymagaj weryfikacji używanego certyfikatu SSL (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Wymagaj weryfikacji używanego certyfikatu SSL",
 		"LABEL_ALLOW_SELF_SIGNED": "Zezwól na certyfikaty z podpisem własnym"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "Beta",
-		"UNSTABLE": "Niestabilne",
 		"WARNING": "Ostrzeżenie!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/user.json b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
index 21b88e224..e34938f38 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Przeczytane",
 		"MENU_SELECT_FLAGGED": "Oznaczone jako ważne",
 		"MENU_SELECT_UNFLAGGED": "Oznaczone jako nieważne",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Brak wiadomości.",
 		"EMPTY_SEARCH_LIST": "Brak wiadomości spełniających kryteria wyszukiwania.",
 		"SEARCH_RESULT_FOR": "Wyniki wyszukiwania dla \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Brak załączników.",
 		"ATTACHMENTS_ERROR_DESC": "Ostrzeżenie! Nie wszystkie załączniki zostały przesłane na serwer.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Jeszcze nie wszystkie załączniki zostały przesłane na serwer.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Żądaj potwierdzenia przeczytania wiadomości",
 		"BUTTON_MARK_AS_IMPORTANT": "Oznacz jako ważną",
 		"BUTTON_REQUEST_DSN": "Żądaj potwierdzenia dostarczenia wiadomości"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Powiadomienia dźwiękowe",
 		"CHROME_NOTIFICATION_DESC": "Wyświetlaj powiadomienia o nowych wiadomościach",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Zablokowane przez przeglądarkę)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatycznie dodawaj odbiorców do książki adresowej",
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
index 6fc8db410..dba7cfe84 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Senha atual",
 		"LABEL_NEW_PASSWORD": "Nova senha",
 		"LABEL_REPEAT_PASSWORD": "Confirmar nova senha",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Exigir verificação do certificado SSL (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Exigir verificação do certificado SSL",
 		"LABEL_ALLOW_SELF_SIGNED": "Permitir certificados auto-assinados"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "instável",
 		"WARNING": "Aviso!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/user.json b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
index bfaac533a..d1fc7823d 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Lidas",
 		"MENU_SELECT_FLAGGED": "Sinalizadas",
 		"MENU_SELECT_UNFLAGGED": "Não Sinalizadas",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Lista Vazia.",
 		"EMPTY_SEARCH_LIST": "Nenhuma mensagem corresponde a sua pesquisa.",
 		"SEARCH_RESULT_FOR": "Resultados de pesquisa para \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Não há anexos aqui.",
 		"ATTACHMENTS_ERROR_DESC": "Alerta! Nem todos os arquivos foram anexados.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Alguns anexos ainda não foram completamente enviados",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Pedir recibo de leitura",
 		"BUTTON_MARK_AS_IMPORTANT": "Marcar como importante",
 		"BUTTON_REQUEST_DSN": "Pedir recibo de entrega"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Notificação sonora",
 		"CHROME_NOTIFICATION_DESC": "Mostrar notificação popup para novas mensagens",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Adicionar automaticamente os destinatários na lista de endereços",
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
index cef446e7f..2888da31f 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Palavra-passe atual",
 		"LABEL_NEW_PASSWORD": "Nova palavra-passe",
 		"LABEL_REPEAT_PASSWORD": "Repetir",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Obrigar a verificação dos certificados SSL utilizados (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Obrigar a verificação dos certificados SSL utilizados",
 		"LABEL_ALLOW_SELF_SIGNED": "Permitir certificados autoassinados"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "instável",
 		"WARNING": "Aviso!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/user.json b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
index a246ad924..73c6c95b9 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Lida",
 		"MENU_SELECT_FLAGGED": "Sinalizada",
 		"MENU_SELECT_UNFLAGGED": "Não sinalizada",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Lista vazia.",
 		"EMPTY_SEARCH_LIST": "Nenhuma mensagem corresponde à sua pesquisa.",
 		"SEARCH_RESULT_FOR": "Resultados de pesquisa para \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Sem anexos aqui.",
 		"ATTACHMENTS_ERROR_DESC": "Aviso! Nem todos os anexos foram carregados.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ainda não foram carregados todos os anexos",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Pedir um recibo de leitura",
 		"BUTTON_MARK_AS_IMPORTANT": "Marcar como importante",
 		"BUTTON_REQUEST_DSN": "Pedir um recibo de entrega"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Notificações sonoras",
 		"CHROME_NOTIFICATION_DESC": "Apresentar notificações para novas mensagens",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Adicionar destinatários automaticamente à sua lista de endereços",
diff --git a/snappymail/v/0.0.0/app/localization/pt/admin.json b/snappymail/v/0.0.0/app/localization/pt/admin.json
index cef446e7f..2888da31f 100644
--- a/snappymail/v/0.0.0/app/localization/pt/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Palavra-passe atual",
 		"LABEL_NEW_PASSWORD": "Nova palavra-passe",
 		"LABEL_REPEAT_PASSWORD": "Repetir",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Obrigar a verificação dos certificados SSL utilizados (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Obrigar a verificação dos certificados SSL utilizados",
 		"LABEL_ALLOW_SELF_SIGNED": "Permitir certificados autoassinados"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "instável",
 		"WARNING": "Aviso!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/pt/user.json b/snappymail/v/0.0.0/app/localization/pt/user.json
index a246ad924..73c6c95b9 100644
--- a/snappymail/v/0.0.0/app/localization/pt/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Lida",
 		"MENU_SELECT_FLAGGED": "Sinalizada",
 		"MENU_SELECT_UNFLAGGED": "Não sinalizada",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Lista vazia.",
 		"EMPTY_SEARCH_LIST": "Nenhuma mensagem corresponde à sua pesquisa.",
 		"SEARCH_RESULT_FOR": "Resultados de pesquisa para \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Sem anexos aqui.",
 		"ATTACHMENTS_ERROR_DESC": "Aviso! Nem todos os anexos foram carregados.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ainda não foram carregados todos os anexos",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Pedir um recibo de leitura",
 		"BUTTON_MARK_AS_IMPORTANT": "Marcar como importante",
 		"BUTTON_REQUEST_DSN": "Pedir um recibo de entrega"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Notificações sonoras",
 		"CHROME_NOTIFICATION_DESC": "Apresentar notificações para novas mensagens",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Adicionar destinatários automaticamente à sua lista de endereços",
diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/user.json b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
index ad8229c31..ec18726bc 100644
--- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Citit",
 		"MENU_SELECT_FLAGGED": "Important",
 		"MENU_SELECT_UNFLAGGED": "Neimportant",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Nimic aici, deocamdată",
 		"EMPTY_SEARCH_LIST": "Nu am găsit nimic.",
 		"SEARCH_RESULT_FOR": "Rezultat căutare \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Cere confirmare de citire",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Sound notification",
 		"CHROME_NOTIFICATION_DESC": "Afișați notificări desktop pentru mesaje noi",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(browser-ul blocat)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Adaugă automat destinatarii la agenda de scrisori",
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
index 0c788d5ea..cf4dbaf98 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Текущий пароль",
 		"LABEL_NEW_PASSWORD": "Новый пароль",
 		"LABEL_REPEAT_PASSWORD": "Повторить пароль",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Требовать проверку SSL сертификата для IMAP и SMTP",
+		"LABEL_REQUIRE_VERIFICATION": "Требовать проверку SSL сертификата для",
 		"LABEL_ALLOW_SELF_SIGNED": "Разрешить cамоподписанные сертификаты"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "unstable",
 		"WARNING": "Внимание!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/user.json b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
index 6e2274ddb..9522c2674 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Прочитанные",
 		"MENU_SELECT_FLAGGED": "Помеченные",
 		"MENU_SELECT_UNFLAGGED": "Без пометок",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "В папке нет писем.",
 		"EMPTY_SEARCH_LIST": "Письма не найдены.",
 		"SEARCH_RESULT_FOR": "Результат поиска \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Прикреплённые файлы отсутствуют.",
 		"ATTACHMENTS_ERROR_DESC": "Внимание! Не все прикреплённые файлы были загружены.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Не все прикреплённые файлы были загружены",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Запрос о прочтении письма",
 		"BUTTON_MARK_AS_IMPORTANT": "Отметить как важное",
 		"BUTTON_REQUEST_DSN": "Запросить уведомление о доставке"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Звуковые уведомления",
 		"CHROME_NOTIFICATION_DESC": "Показывать уведомления о новых сообщениях в всплывающих подсказках",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Блокировано браузером)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Автоматически добавлять получателей писем в адресную книгу",
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
index d473cea39..fe87cd306 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Súčasné heslo",
 		"LABEL_NEW_PASSWORD": "Nové heslo",
 		"LABEL_REPEAT_PASSWORD": "Opakovať",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate used (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate used",
 		"LABEL_ALLOW_SELF_SIGNED": "Allow self signed certificates"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "nestabilné",
 		"WARNING": "Upozornenie!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/user.json b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
index 84beaedda..178fa7c1a 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Prečítané",
 		"MENU_SELECT_FLAGGED": "Označené",
 		"MENU_SELECT_UNFLAGGED": "Neoznačené",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Zoznam je prázdny.",
 		"EMPTY_SEARCH_LIST": "Vášmu vyhľadávaniu nezodpovedajú žiadne správy.",
 		"SEARCH_RESULT_FOR": "Výsledky vyhľadávania pre \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Žiadne prílohy.",
 		"ATTACHMENTS_ERROR_DESC": "Pozor! Nie všetky prílohy boli nahraté.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Nie všetky prílohy boli už nahraté na server.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Vyžiadať potvrdenie o prečítaní",
 		"BUTTON_MARK_AS_IMPORTANT": "Označiť ako dôležité",
 		"BUTTON_REQUEST_DSN": "Vyžiadať potvrdenie o doručení"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Sound notification",
 		"CHROME_NOTIFICATION_DESC": "Zobrazovať upozornenia na nové správy",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prehliadačom)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automaticky pridávať príjemcov správ do Adresára",
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
index 4a257fbe3..0c4038169 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Trenutno geslo",
 		"LABEL_NEW_PASSWORD": "Novo geslo",
 		"LABEL_REPEAT_PASSWORD": "Ponovno",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Obvezno overjanje uporabljenega SSL certifikata (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Obvezno overjanje uporabljenega SSL certifikata",
 		"LABEL_ALLOW_SELF_SIGNED": "Dovoli samopodpisane certifikate"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "nestabilno",
 		"WARNING": "Pozor!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/user.json b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
index 32c648de3..7c8746ca7 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Prebrana",
 		"MENU_SELECT_FLAGGED": "Z zvezdico",
 		"MENU_SELECT_UNFLAGGED": "Brez zvezdice",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Prazen seznam.",
 		"EMPTY_SEARCH_LIST": "Brez ujemanj.",
 		"SEARCH_RESULT_FOR": "Ujemanja za \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Ni prilog.",
 		"ATTACHMENTS_ERROR_DESC": "Pozor! Priloge niso bile vse naložene.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Priloge še niso bile naložene v celoti.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Zahtevaj potrdilo o branju",
 		"BUTTON_MARK_AS_IMPORTANT": "Označi kot pomembno",
 		"BUTTON_REQUEST_DSN": "Zahtevaj potrdilo o dostavi"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Zvočno obvestilo",
 		"CHROME_NOTIFICATION_DESC": "Prikaži obvestila ob novih sporočilih",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Zavrnil brskalnik)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Samodejno dodaj prejemnike v imenik",
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
index 95682f0b7..d9d7d60c0 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Nuvarande lösenord",
 		"LABEL_NEW_PASSWORD": "Nytt lösenord",
 		"LABEL_REPEAT_PASSWORD": "Upprepa",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Kräver verifiering av SSL-certifikat som används (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Kräver verifiering av SSL-certifikat som används",
 		"LABEL_ALLOW_SELF_SIGNED": "Låt självsignerade certifikat"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "instabil",
 		"WARNING": "Varning!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/user.json b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
index bea8a4017..6fb1a1717 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Läst",
 		"MENU_SELECT_FLAGGED": "Flaggad",
 		"MENU_SELECT_UNFLAGGED": "Avflaggad",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tom lista",
 		"EMPTY_SEARCH_LIST": "Inga meddelanden matchar din sökning.",
 		"SEARCH_RESULT_FOR": "Sök resultat för \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Inga filer är ännu valda",
 		"ATTACHMENTS_ERROR_DESC": "Varning! Inte alla bilagor har överförts.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Alla bilagor är inte uppladddade än",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Begär mottagningskvitto",
 		"BUTTON_MARK_AS_IMPORTANT": "Markera som viktigt",
 		"BUTTON_REQUEST_DSN": "Begär ett leveranskvitto"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Ljudnotifikation",
 		"CHROME_NOTIFICATION_DESC": "Visa nya meddelande-aviseringar som popup-fönster",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Blockat av webbläsaren)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Lägg till mottagare automatiskt i din adressbok",
diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/user.json b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
index 3ff847ee1..e67350a55 100644
--- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Oku",
 		"MENU_SELECT_FLAGGED": "İşaretlenmiş",
 		"MENU_SELECT_UNFLAGGED": "İşaretlenmemiş",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Herhangi Bir Sonuç Bulunamadı.",
 		"EMPTY_SEARCH_LIST": "Arama sonuçlarına uyan herhangi bir mesaj bulunamadı.",
 		"SEARCH_RESULT_FOR": "\"%SEARCH%\" için arama sonuçları",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Okundu bilgisi iste",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Sound notification",
 		"CHROME_NOTIFICATION_DESC": "Yeni mesajları pop-up ile göster",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Tarayıcınız tarafından engellendi)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Otomatik olarak adres defterinize alıcıyı ekle",
diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/user.json b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
index b59948d69..18a1db642 100644
--- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Прочитані",
 		"MENU_SELECT_FLAGGED": "Відмічені",
 		"MENU_SELECT_UNFLAGGED": "Без поміток",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "В папці немає листів.",
 		"EMPTY_SEARCH_LIST": "Листи не знайдено.",
 		"SEARCH_RESULT_FOR": "Результат пошуку \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Запит про прочитання листа",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Звукове сповіщення",
 		"CHROME_NOTIFICATION_DESC": "Показувати сповіщення про нові повідомлення у підказках",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Заблоковано браузером)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Автоматично додавати отримувачів у адресну книгу",
diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
index 27c1906bd..82e851cfb 100644
--- a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "Mật khẩu hiện tại",
 		"LABEL_NEW_PASSWORD": "Mật khẩu mới",
 		"LABEL_REPEAT_PASSWORD": "Lập lại mật khẩu",
-		"LEGEND_SSL": "Chứng chỉ số SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Yêu cầu xác minh chứng chỉ SSL được dùng (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Yêu cầu xác minh chứng chỉ SSL được dùng",
 		"LABEL_ALLOW_SELF_SIGNED": "Cho phép chứng chỉ tự ký"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "đang thử nghiệm",
-		"UNSTABLE": "chưa ổn định",
 		"WARNING": "Cảnh báo!"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/user.json b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
index 34173a9b0..a48a9666d 100644
--- a/snappymail/v/0.0.0/app/localization/vi-VN/user.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "Đã đọc",
 		"MENU_SELECT_FLAGGED": "Được đánh dấu sao",
 		"MENU_SELECT_UNFLAGGED": "Không được đánh dấu sao",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Danh sách trống.",
 		"EMPTY_SEARCH_LIST": "Không tìm thấy thư trùng khớp.",
 		"SEARCH_RESULT_FOR": "Kết quả tìm kiếm cho \"%SEARCH%\"",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Không có tập tin đính kèm.",
 		"ATTACHMENTS_ERROR_DESC": "Cảnh báo! Các tập tin đính kèm chưa được tải lên hết.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Các tập tin đính kèm chưa được tải lên hết.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Yêu cầu thông báo khi người nhận đã đọc thư",
 		"BUTTON_MARK_AS_IMPORTANT": "Đánh dấu thư quan trọng",
 		"BUTTON_REQUEST_DSN": "Yêu cầu thông báo thư đã gửi thành công"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Thông báo âm thanh",
 		"CHROME_NOTIFICATION_DESC": "Hiện thị thông báo nẩy lên nhanh khi có thư mới",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Đang bị chặn bởi trình duyệt web)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Tự động thêm người nhận thư vào sổ địa chỉ của bạn",
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
index bf9a519ae..c8308a1f0 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
@@ -88,8 +88,7 @@
 		"LABEL_CURRENT_PASSWORD": "当前密码",
 		"LABEL_NEW_PASSWORD": "新密码",
 		"LABEL_REPEAT_PASSWORD": "重复输入新密码",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "要求验证 SSL 证书（IMAP\/SMTP）",
+		"LABEL_REQUIRE_VERIFICATION": "要求验证 SSL 证书",
 		"LABEL_ALLOW_SELF_SIGNED": "允许自签名证书"
 	},
 	"TAB_PACKAGES": {
@@ -158,7 +157,6 @@
 	},
 	"HINTS": {
 		"BETA": "测试版本",
-		"UNSTABLE": "不稳定版本",
 		"WARNING": "警告"
 	},
 	"ERRORS": {
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
index 20e6ec197..5750a297f 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
@@ -6,7 +6,7 @@
 		"BCC": "密送",
 		"CANCEL": "取消",
 		"CC": "抄送",
-		"CLEAR": "取消",
+		"CLEAR": "清除",
 		"CLOSE": "关闭",
 		"CONTACTS": "联系人",
 		"DELETE": "删除",
@@ -33,7 +33,7 @@
 		"SERVER_MESSAGE": "服务器信息",
 		"YES": "是",
 		"NO": "否",
-		"INACTIVE": "Inactive"
+		"INACTIVE": "不生效"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "登录",
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "已读",
 		"MENU_SELECT_FLAGGED": "已加星标",
 		"MENU_SELECT_UNFLAGGED": "未加星标",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "空列表。",
 		"EMPTY_SEARCH_LIST": "未找到您搜索的消息。",
 		"SEARCH_RESULT_FOR": "搜索 \"%SEARCH%\" 的结果",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "无附件。",
 		"ATTACHMENTS_ERROR_DESC": "注意！还有正在上传的附件。",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "还有附件正在上传。",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "要求已读回执",
 		"BUTTON_MARK_AS_IMPORTANT": "标记为“重要”",
 		"BUTTON_REQUEST_DSN": "要求送达回执"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "提示音",
 		"CHROME_NOTIFICATION_DESC": "显示新邮件弹窗",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(被浏览器阻止)",
-		"LIST_INLINE_ATTACHMENTS": "在列表中显示内联附件"
+		"LIST_INLINE_ATTACHMENTS": "在列表中显示内联附件",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "自动添加到您的地址簿",
diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/user.json b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
index f76a51ce7..cbd23c4b4 100644
--- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
@@ -98,6 +98,7 @@
 		"MENU_SELECT_SEEN": "已讀",
 		"MENU_SELECT_FLAGGED": "已加星標",
 		"MENU_SELECT_UNFLAGGED": "未加星標",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "空列表。",
 		"EMPTY_SEARCH_LIST": "未找到您想要的。",
 		"SEARCH_RESULT_FOR": "搜索 \"%SEARCH%\" 的結果",
@@ -224,6 +225,7 @@
 		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
 		"BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt"
@@ -411,7 +413,8 @@
 		"SOUND_NOTIFICATION": "Sound notification",
 		"CHROME_NOTIFICATION_DESC": "顯示新郵件彈窗",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(被瀏覽器阻止)",
-		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "自動添加到你的位址簿",
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
index c4ee56284..fb4e29d47 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
@@ -27,7 +27,7 @@
 	</div>
 	<div id="plugin-Login-BottomControlGroup"></div>
 	<div class="controls">
-		<button class="btn btn-large btn-block"
+		<button class="btn btn-large buttonLogin"
 			data-bind="command: submitCommand"
 			data-i18n="LOGIN/BUTTON_LOGIN"></button>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
index b261adad7..dc46592eb 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
@@ -1,5 +1,5 @@
 <div class="b-toolbar g-ui-user-select-none">
-	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: leftPanelDisabled.toggle, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
+	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
 	<h4>SnappyMail - <span data-i18n="TOP_PANEL/LABEL_ADMIN_PANEL"></span></h4>
 	<a class="btn btn-logout fontastic" data-bind="click: logoutClick">⏻</a>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
index 681b7c59e..8264d22c8 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
@@ -34,8 +34,8 @@
 					</span>
 					<br />
 					<a class="btn" href="https://github.com/the-djmaze/snappymail/releases" target="_blank" data-i18n="TAB_ABOUT/BUTTON_RELEASES"></a>
-					<a class="btn" data-bind="visible: coreUpdatable(), click: updateCoreData" data-i18n="GLOBAL/UPDATE"></a>
-					<a class="btn" href="https://github.com/the-djmaze/snappymail/releases/latest" data-bind="hidden: coreUpdatable()" data-i18n="GLOBAL/UPDATE"></a>
+					<a class="btn" data-bind="visible: coreUpdatable, click: updateCoreData" data-i18n="GLOBAL/UPDATE"></a>
+					<a class="btn" href="https://github.com/the-djmaze/snappymail/releases/latest" data-bind="visible: !coreUpdatable()" data-i18n="GLOBAL/UPDATE"></a>
 				</div>
 				<div data-bind="visible: 'up-to-date' === statusType()">
 					<i style="color: green">✔</i>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
index bc2ebd538..98171ac6c 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
@@ -32,3 +32,8 @@
 		</tr>
 	</tbody>
 </table>
+<hr/>
+<div>
+	<input data-i18n="[placeholder]GLOBAL/USERNAME" data-bind="textInput: username">
+	<button class="btn" data-i18n="GLOBAL/TEST" data-bind="click: testUsername"></button>
+</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
index 32f3e8dc4..6d3d1aa3b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
@@ -13,8 +13,7 @@
 				name: 'Checkbox',
 				params: {
 					value: capaOpenPGP,
-					label: 'TAB_SECURITY/LABEL_ALLOW_OPEN_PGP',
-					inline: true
+					label: 'TAB_SECURITY/LABEL_ALLOW_OPEN_PGP'
 				}
 			}"></div>
 		</div>
@@ -58,19 +57,16 @@
 	</div>
 </form>
 <div class="form-horizontal">
-	<div class="legend" data-i18n="TAB_SECURITY/LEGEND_SSL"></div>
+	<div class="legend">SSL/TLS</div>
 	<div class="control-group">
 		<div>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
 					value: verifySslCertificate,
-					label: 'TAB_SECURITY/LABEL_REQUIRE_VERIFICATION',
-					inline: true
+					label: 'TAB_SECURITY/LABEL_REQUIRE_VERIFICATION'
 				}
 			}"></div>
-			<span style="color:red"> (<span data-i18n="HINTS/UNSTABLE"></span>)</span>
-			<br>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index 991093c9d..bf8318a4b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -8,7 +8,7 @@
 			<span data-i18n="POPUPS_DOMAIN/LABEL_NAME"></span>
 			<span style="opacity:0.7"> (<span data-i18n="POPUPS_DOMAIN/NAME_HELPER"></span>)</span>
 			<br>
-			<input type="text" class="span4" autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off"
+			<input name="Name" type="text" class="span4" autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off"
 				data-bind="textInput: name">
 			<div class="alert-error" data-bind="visible: savingError, text: savingError"></div>
 		</div>
@@ -18,8 +18,8 @@
 	<div class="form-horizontal domain-form">
 		<div class="tabs">
 
-			<input type="radio" name="helptabs" id="tab-help1" checked>
-			<label for="tab-help1" role="tab" tabindex="0"
+			<input type="radio" name="tabs" id="tab-imap" checked>
+			<label for="tab-imap" role="tab" tabindex="0"
 				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingImapError }, tooltipErrorTip: testingImapErrorDesc"
 				data-i18n="POPUPS_DOMAIN/LABEL_IMAP"></label>
 			<div class="tab-content" role="tabpanel" aria-hidden="false">
@@ -27,13 +27,13 @@
 					<div class="span3">
 						<span data-i18n="POPUPS_DOMAIN/LABEL_SERVER"></span>
 						<br>
-						<input type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off"
+						<input name="IMAP[host]" type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off"
 							data-bind="textInput: imapHost, hasfocus: imapHostFocus">
 					</div>
 					<div class="span2">
 						<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
 						<br>
-						<select class="span2" data-bind="value: imapSecure">
+						<select name="IMAP[type]" class="span2" data-bind="value: imapType">
 							<option value="0" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_NONE"></option>
 							<option value="1" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_SSL"></option>
 							<option value="2" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_STARTTLS"></option>
@@ -42,39 +42,55 @@
 					<div class="span2">
 						<span data-i18n="POPUPS_DOMAIN/LABEL_PORT"></span>
 						<br>
-						<input type="number" autocomplete="off" autocorrect="off" autocapitalize="off"
+						<input name="IMAP[port]" type="number" autocomplete="off" autocorrect="off" autocapitalize="off"
 							style="width:6em" data-bind="textInput: imapPort">
 					</div>
 				</div>
 				<br>
-				<div data-bind="component: {
+				<div style="display: inline-block;" data-bind="component: {
 					name: 'Checkbox',
 					params: {
 						label: 'POPUPS_DOMAIN/LABEL_USE_SHORT_LOGIN',
-						value: imapShortLogin,
-						inline: true
+						value: imapShortLogin
 					}
 				}"></div>
 				<span style="opacity:0.7"> (user@domain.com → user)</span>
+
+				<h4>SSL/TLS</h4>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						value: imapSslVerify_peer,
+						label: 'TAB_SECURITY/LABEL_REQUIRE_VERIFICATION'
+					}
+				}"></div>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						enable: imapSslVerify_peer,
+						value: imapSslAllow_self_signed,
+						label: 'TAB_SECURITY/LABEL_ALLOW_SELF_SIGNED'
+					}
+				}"></div>
 			</div>
 
-			<input type="radio" name="helptabs" id="tab-help2">
-			<label for="tab-help2" role="tab" tabindex="0"
+			<input type="radio" name="tabs" id="tab-smtp">
+			<label for="tab-smtp" role="tab" tabindex="0"
 				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingSmtpError }, tooltipErrorTip: testingSmtpErrorDesc"
 				data-i18n="POPUPS_DOMAIN/LABEL_SMTP"></label>
 			<div class="tab-content" role="tabpanel" aria-hidden="true">
-				<div data-bind="visible: !smtpPhpMail()">
+				<div data-bind="visible: !smtpUsePhpMail()">
 					<div class="row">
 						<div class="span3">
 							<span data-i18n="POPUPS_DOMAIN/LABEL_SERVER"></span>
 							<br>
-							<input type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off"
+							<input name="SMTP[host]" type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off"
 								data-bind="textInput: smtpHost, hasfocus: smtpHostFocus">
 						</div>
 						<div class="span2">
 							<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
 							<br>
-							<select class="span2" data-bind="value: smtpSecure">
+							<select name="SMTP[type]" class="span2" data-bind="value: smtpType">
 								<option value="0" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_NONE"></option>
 								<option value="1" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_SSL"></option>
 								<option value="2" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_STARTTLS"></option>
@@ -83,17 +99,16 @@
 						<div class="span2">
 							<span data-i18n="POPUPS_DOMAIN/LABEL_PORT"></span>
 							<br>
-							<input type="number" autocomplete="off" autocorrect="off" autocapitalize="off"
+							<input name="SMTP[port]" type="number" autocomplete="off" autocorrect="off" autocapitalize="off"
 								style="width:6em" data-bind="textInput: smtpPort">
 						</div>
 					</div>
 					<br>
-					<div data-bind="component: {
+					<div style="display: inline-block;" data-bind="component: {
 						name: 'Checkbox',
 						params: {
 							label: 'POPUPS_DOMAIN/LABEL_USE_SHORT_LOGIN',
-							value: smtpShortLogin,
-							inline: true
+							value: smtpShortLogin
 						}
 					}"></div>
 					<span style="opacity:0.7"> (user@domain.com → user)</span>
@@ -101,7 +116,7 @@
 						name: 'Checkbox',
 						params: {
 							label: 'POPUPS_DOMAIN/LABEL_USE_AUTH',
-							value: smtpAuth
+							value: smtpUseAuth
 						}
 					}"></div>
 					<br>
@@ -110,24 +125,38 @@
 					name: 'Checkbox',
 					params: {
 						label: 'POPUPS_DOMAIN/LABEL_SET_SENDER',
-						value: smtpSetSender,
-						inline: true
+						value: smtpSetSender
 					}
 				}"></div>
-				<br>
-				<div data-bind="component: {
+				<div style="display: inline-block;" data-bind="component: {
 					name: 'Checkbox',
 					params: {
 						label: 'POPUPS_DOMAIN/LABEL_USE_PHP_MAIL',
-						value: smtpPhpMail,
-						inline: true
+						value: smtpUsePhpMail
 					}
 				}"></div>
 				<span style="color:red"> (<span data-i18n="HINTS/BETA"></span>)</span>
+
+				<h4>SSL/TLS</h4>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						value: smtpSslVerify_peer,
+						label: 'TAB_SECURITY/LABEL_REQUIRE_VERIFICATION'
+					}
+				}"></div>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						enable: smtpSslVerify_peer,
+						value: smtpSslAllow_self_signed,
+						label: 'TAB_SECURITY/LABEL_ALLOW_SELF_SIGNED'
+					}
+				}"></div>
 			</div>
 
-			<input type="radio" name="helptabs" id="tab-help3">
-			<label for="tab-help3" role="tab" tabindex="0"
+			<input type="radio" name="tabs" id="tab-sieve">
+			<label for="tab-sieve" role="tab" tabindex="0"
 				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingSieveError }, tooltipErrorTip: testingSieveErrorDesc">
 				<i class="icon-filter"></i>
 				<span data-i18n="POPUPS_DOMAIN/LABEL_SIEVE"></span>
@@ -138,29 +167,29 @@
 						name: 'Checkbox',
 						params: {
 							label: 'POPUPS_DOMAIN/LABEL_ALLOW_SIEVE_SCRIPTS',
-							value: useSieve
+							value: sieveEnabled
 						}
 					}"></div>
 				</div>
-				<div data-bind="visible: useSieve">
+				<div data-bind="visible: sieveEnabled">
 					<div class="row">
 						<div class="span3">
 							<span data-i18n="POPUPS_DOMAIN/LABEL_SERVER"></span>
 							<br>
-							<input type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off"
+							<input name="Sieve[host]" type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off"
 								data-bind="textInput: sieveHost, hasfocus: sieveHostFocus">
 						</div>
 						<div class="span2">
 							<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
 							<br>
-							<select class="span2" data-bind="value: sieveSecure">
+							<select name="Sieve[type]" class="span2" data-bind="value: sieveType">
 								<option value="0" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_NONE"></option>
 								<option value="1" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_SSL"></option>
 								<option value="2" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_STARTTLS"></option>
 							</select>
 						</div>
 						<div class="span2">
-							<span data-i18n="POPUPS_DOMAIN/LABEL_PORT"></span>
+							<span name="Sieve[port]" data-i18n="POPUPS_DOMAIN/LABEL_PORT"></span>
 							<br>
 							<input type="number" autocomplete="off" autocorrect="off" autocapitalize="off"
 								style="width:6em" data-bind="textInput: sievePort">
@@ -169,8 +198,8 @@
 				</div>
 			</div>
 
-			<input type="radio" name="helptabs" id="tab-help4">
-			<label for="tab-help4" role="tab" tabindex="0" data-icon="👥" data-i18n="POPUPS_DOMAIN/BUTTON_WHITE_LIST"></label>
+			<input type="radio" name="tabs" id="tab-whitelist">
+			<label for="tab-whitelist" role="tab" tabindex="0" data-icon="👥" data-i18n="POPUPS_DOMAIN/BUTTON_WHITE_LIST"></label>
 			<div class="tab-content" role="tabpanel" aria-hidden="true">
 				<div class="alert" data-i18n="POPUPS_DOMAIN/WHITE_LIST_ALERT"></div>
 				<textarea class="input-xxlarge" style="width: 100%" rows="8" data-bind="value: whiteList" tabindex="-1"></textarea>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
index d662ee127..051d9bb6c 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
@@ -38,7 +38,7 @@
 		</div>
 	</div>
 	<div>
-		<button class="btn btn-large btn-block buttonLogin"
+		<button class="btn btn-large buttonLogin"
 			data-bind="command: submitCommand"
 			data-i18n="LOGIN/BUTTON_SIGN_IN"></button>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
index cc360516a..a46b64465 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
@@ -24,10 +24,10 @@
 		<ul class="b-folders-user" data-bind="template: { name: 'MailFolderListItem', foreach: folderListVisible }"></ul>
 		<div class="move-action-content-wrapper" data-bind="visible: moveAction"></div>
 	</div>
-	<div class="b-content show-on-panel-disabled" data-bind="click: leftPanelDisabled.toggle()"></div>
+	<div class="b-content show-on-panel-disabled" data-bind="click: toggleLeftPanel"></div>
 	<div class="b-footer btn-toolbar hide-mobile">
 		<div class="btn-group">
-			<a class="btn" data-bind="click: leftPanelDisabled.toggle(), css: {'icon-resize-out': leftPanelDisabled(), 'icon-resize-in': !leftPanelDisabled()}"></a>
+			<a class="btn fontastic" data-bind="click: toggleLeftPanel, text: leftPanelDisabled() ? '❯' : '❮'"></a>
 		</div>
 		<div class="btn-group hide-on-panel-disabled">
 			<a class="btn icon-folder-add" data-bind="click: createFolder" data-i18n="[title]POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER"></a>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
index aba0596eb..a306a89ea 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -1,6 +1,6 @@
 <div class="btn-toolbar">
 	<!-- ko if: isMobile() -->
-	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: leftPanelDisabled.toggle, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
+	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
 	<a class="btn buttonCompose" data-bind="click: composeClick, css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}, visible: mobileCheckedStateHide()" data-i18n="[title]FOLDER_LIST/BUTTON_NEW_MESSAGE">
 		<i class="icon-paper-plane"></i>
 	</a>
@@ -43,7 +43,25 @@
 			<li class="dividerbar" role="presentation" data-bind="command: forwardCommand">
 				<a href="#" tabindex="-1" data-icon="↞" data-i18n="MESSAGE_LIST/BUTTON_MULTY_FORWARD"></a>
 			</li>
-			<li class="dividerbar" role="presentation" data-bind="visible: allowDangerousActions, command: deleteWithoutMoveCommand">
+			<li role="presentation" data-bind="command: downloadCommand">
+				<a href="#" tabindex="-1" data-icon="" data-i18n="MESSAGE_LIST/DOWNLOAD_ALL_ATTACHMENTS"></a>
+			</li>
+			<li class="dividerbar" role="presentation" data-bind="command: moveCommand">
+				<a href="#" tabindex="-1" data-icon="📁" data-i18n="GLOBAL/MOVE_TO"></a>
+			</li>
+			<li role="presentation" data-bind="visible: archiveAllowed, command: archiveCommand">
+				<a href="#" tabindex="-1" data-icon="🗄" data-i18n="GLOBAL/TO_ARCHIVE">🗄</a>
+			</li>
+			<li role="presentation" data-bind="visible: canMarkAsSpam, command: spamCommand">
+				<a href="#" tabindex="-1" data-icon="⚠" data-i18n="GLOBAL/SPAM"></a>
+			</li>
+			<li role="presentation" data-bind="visible: isSpamFolder, command: notSpamCommand">
+				<a href="#" tabindex="-1" data-icon="" data-i18n="GLOBAL/NOT_SPAM"></a>
+			</li>
+			<li role="presentation" data-bind="command: deleteCommand">
+				<a href="#" tabindex="-1" data-icon="🗑" data-i18n="GLOBAL/DELETE"></a>
+			</li>
+			<li role="presentation" data-bind="visible: allowDangerousActions, command: deleteWithoutMoveCommand">
 				<a href="#" tabindex="-1" data-icon="🗑" data-i18n="MESSAGE_LIST/BUTTON_DELETE_WITHOUT_MOVE"></a>
 			</li>
 			<li role="presentation" data-bind="visible: allowDangerousActions, click: clear">
@@ -124,7 +142,7 @@
 				</div>
 			</div>
 		</div>
-		<div id="messagesDragImage"><span class="text"></span>&nbsp;<i class="icon-mail"></i></div>
+		<div id="messagesDragImage"><span class="text"></span>&nbsp;<span class="fontastic">✉</span></div>
 	</div>
 	<div class="b-footer thm-message-list-bottom-toolbar">
 		<!-- ko if: userUsageProc() -->
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index 477ab8190..3ce790aeb 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -98,10 +98,7 @@
 									</a>
 								</li>
 								<li role="presentation">
-									<a href="#" tabindex="-1" data-bind="click: popupMessage">
-										<i class="icon-popup"></i>
-										<span data-i18n="MESSAGE/BUTTON_IN_NEW_WINDOW"></span>
-									</a>
+									<a href="#" tabindex="-1" data-bind="click: popupMessage" data-icon="⧉" data-i18n="MESSAGE/BUTTON_IN_NEW_WINDOW"></a>
 								</li>
 								<li role="presentation" data-bind="visible: html() && !isHtml()">
 									<a href="#" tabindex="-1" data-bind="click: viewHtml" data-icon="👁" data-i18n="MESSAGE/HTML_VIEW"></a>
@@ -131,34 +128,15 @@
 					<span class="subject" data-bind="text: message().subject, title: message().subject"></span>
 					<a href="#" class="close" data-bind="click: closeMessage" style="margin-top: -8px;">×</a>
 				</div>
-				<div data-bind="hidden: showFullInfo">
-					<div class="informationShort">
-						<span class="from" data-bind="html: viewFromShort, title: message().fromToLine()"></span>
-						<i data-bind="visible: viewFromDkimVisibility, css: viewFromDkimStatusIconClass, title: viewFromDkimStatusTitle"></i>
-						<div data-bind="visible: 0 < message().dateTimeStampInUTC()">
-							(<time class="date" data-moment-format="FULL" data-bind="moment: message().dateTimeStampInUTC()"></time>)
-						</div>
-					</div>
-					<div class="informationShortWrp">
-						<div class="informationShort" data-bind="visible: message().toToLine()">
-							<span data-i18n="GLOBAL/TO"></span>:
-							<span data-bind="text: message().toToLine()"></span>
-						</div>
-						<div class="informationShort" data-bind="visible: message().ccToLine()">
-							<span data-i18n="GLOBAL/CC"></span>:
-							<span data-bind="text: message().ccToLine()"></span>
-						</div>
-					</div>
-					<div class="informationShort" data-bind="visible: message().spamResult()">
-						<span data-i18n="MESSAGE/SPAM_SCORE"></span>:
-						<meter min="0" max="100" optimum="0" low="33" high="66" data-bind="value: message().spamScore(), title: message().spamStatus()"></meter>
-					</div>
+				<div class="informationShort" data-bind="hidden: showFullInfo">
+					<span class="from" data-bind="html: viewFromShort, title: message().fromToLine()"></span>
+					<i data-bind="visible: viewFromDkimVisibility, css: viewFromDkimStatusIconClass, title: viewFromDkimStatusTitle"></i>
 				</div>
 				<div class="informationFull" data-bind="visible: showFullInfo, with: message">
 					<table>
 						<tr data-bind="visible: fromToLine()">
 							<td data-i18n="GLOBAL/FROM"></td>
-							<td><span data-bind="text: fromToLine(), title: fromToLine()"></span>
+							<td><span data-bind="text: fromToLine()"></span>
 								<i data-bind="visible: $parent.viewFromDkimVisibility, css: $parent.viewFromDkimStatusIconClass, title: $parent.viewFromDkimStatusTitle"></i>
 							</td>
 						</tr>
@@ -186,9 +164,9 @@
 								(<time data-moment-format="FROMNOW" data-bind="moment: dateTimeStampInUTC()"></time>)
 							</td>
 						</tr>
-						<tr data-bind="visible: 0 < spamScore()">
-							<td data-i18n="MESSAGE/SPAM_SCORE"></td>
-							<td><span data-bind="text: spamScore(), title: spamStatus()"></span>%</td>
+						<tr data-bind="visible: spamResult">
+							<td data-i18n="GLOBAL/SPAM"></td>
+							<td data-bind="text: spamStatus()"></td>
 						</tr>
 						<tr data-bind="visible: friendlySize()">
 							<td data-i18n="POPUPS_FILTER/SELECT_FIELD_SIZE"></td>
@@ -196,45 +174,61 @@
 						</tr>
 					</table>
 				</div>
-				<div class="hasVirus" data-bind="visible: message().hasVirus()" data-i18n="MESSAGE/HAS_VIRUS_WARNING"></div>
-				<!-- ko if: tagsAllowed -->
-				<div class="messageTags">
-					<span data-i18n="MESSAGE/TAGS"></span>:
-					<span class="messageAssignedTags" data-bind="html: message().tagsToHTML()"></span>
-					<div class="btn-group" data-bind="registerBootstrapDropdown: true" style="display: inline-block">
-						<a class="btn btn-thin btn-transparent dropdown-toggle fontastic" id="tags-dropdown-id" href="#" tabindex="-1">🏷</a>
-						<menu class="dropdown-menu right-edge" role="menu" aria-labelledby="tags-dropdown-id">
-							<div data-bind="foreach: message().tagOptions()">
-								<li role="presentation">
-									<a href="#" tabindex="-1" data-icon="☐" data-bind="click: toggle, text: label, title: value, attr: { class: css, 'data-icon': checked ? '☑' : '☐' }"></a>
-								</li>
-							</div>
-							<li role="presentation" class="dividerbar">
-								<a href="#" tabindex="-1" data-icon="✚" data-bind="click: newTag" data-i18n="MESSAGE/NEW_TAG"></a>
-							</li>
-						</menu>
-					</div>
-				</div>
-				<!-- /ko -->
 			</div>
 			<div id="messageItem">
+				<div class="messageItemHeader">
+					<div data-bind="hidden: showFullInfo">
+						<time class="date" data-moment-format="FULL" data-bind="visible: 0 < message().dateTimeStampInUTC(), moment: message().dateTimeStampInUTC()"></time>
+						<div class="informationShortWrp">
+							<div class="informationShort" data-bind="visible: message().toToLine()">
+								<span data-i18n="GLOBAL/TO"></span>:
+								<span data-bind="text: message().toToLine()"></span>
+							</div>
+							<div class="informationShort" data-bind="visible: message().ccToLine()">
+								<span data-i18n="GLOBAL/CC"></span>:
+								<span data-bind="text: message().ccToLine()"></span>
+							</div>
+						</div>
+						<div class="informationShort" data-bind="visible: message().spamResult()">
+							<span data-i18n="MESSAGE/SPAM_SCORE"></span>:
+							<meter min="0" max="100" optimum="0" low="33" high="66" data-bind="value: message().spamScore(), title: message().spamStatus()"></meter>
+						</div>
+					</div>
+					<div class="hasVirus" data-bind="visible: message().hasVirus()" data-i18n="MESSAGE/HAS_VIRUS_WARNING"></div>
+					<!-- ko if: tagsAllowed -->
+					<div class="messageTags">
+						<span data-i18n="MESSAGE/TAGS"></span>:
+						<span class="messageAssignedTags" data-bind="html: message().tagsToHTML()"></span>
+						<div class="btn-group" data-bind="registerBootstrapDropdown: true" style="display: inline-block">
+							<a class="btn btn-thin btn-transparent dropdown-toggle fontastic" id="tags-dropdown-id" href="#" tabindex="-1">🏷</a>
+							<menu class="dropdown-menu right-edge" role="menu" aria-labelledby="tags-dropdown-id">
+								<div data-bind="foreach: message().tagOptions()">
+									<li role="presentation">
+										<a href="#" tabindex="-1" data-icon="☐" data-bind="click: toggle, text: label, title: value, attr: { class: css, 'data-icon': checked ? '☑' : '☐' }"></a>
+									</li>
+								</div>
+								<li role="presentation" class="dividerbar">
+									<a href="#" tabindex="-1" data-icon="✚" data-bind="click: newTag" data-i18n="MESSAGE/NEW_TAG"></a>
+								</li>
+							</menu>
+						</div>
+					</div>
+					<!-- /ko -->
+				</div>
 				<div tabindex="0" data-bind="hasfocus: messageDomFocused">
 
-					<span class="buttonFull" data-bind="click: toggleFullScreen">
-						<i data-bind="css: { 'icon-arrows-out': !fullScreenMode(), 'icon-arrows-in': fullScreenMode }"></i>
-					</span>
-					<div class="loading" data-bind="visible: messageLoadingThrottle()">
+					<div class="loading" data-bind="visible: messageLoadingThrottle">
 						<i class="icon-spinner"></i>
 						<span data-i18n="GLOBAL/LOADING"></span>
 					</div>
 
-					<div data-bind="visible: !messageLoadingThrottle()">
+					<div data-bind="hidden: messageLoadingThrottle">
 						<div class="bodySubHeader">
-							<div class="showImages" data-bind="visible: message().hasImages(), click: showImages"
-								data-icon="🖼" data-i18n="MESSAGE/BUTTON_SHOW_IMAGES"></div>
 							<div class="readReceipt" data-bind="visible: !isDraftOrSentFolder() && message().readReceipt() && !message().isReadReceipt(), click: readReceipt"
 								data-icon="✉" data-i18n="MESSAGE/BUTTON_NOTIFY_READ_RECEIPT"></div>
-							<div class="attachmentsPlace" data-bind="visible: message().hasAttachments(), css: {'selection-mode' : showAttachmentControls}">
+							<details class="attachmentsPlace" data-bind="visible: message().hasAttachments(), css: {'selection-mode' : showAttachmentControls}">
+								<summary data-i18n="MESSAGE/PRINT_LABEL_ATTACHMENTS"></summary>
+								<!-- ko ifnot: simpleAttachmentsList -->
 								<ul class="attachmentList" data-bind="foreach: message().listAttachments()">
 									<li class="attachmentItem" draggable="true"
 											data-bind="event: { 'dragstart': eventDragStart }, attr: { 'title': fileName }, css: {'checked': checked}">
@@ -253,7 +247,7 @@
 											</div>
 										</div>
 										<div class="attachmentNameParent">
-											<div style="white-space: nowrap; text-overflow: ellipsis; overflow: hidden;" class="attachmentName" data-bind="text: fileName"></div>
+											<div class="attachmentName" data-bind="text: fileName"></div>
 											<div class="attachmentSize" data-bind="text: friendlySize()"></div>
 										</div>
 										<div class="checkboxAttachment fontastic"
@@ -261,8 +255,19 @@
 												click: function () { checked(!checked()); return false }"></div>
 									</li>
 								</ul>
+								<!-- /ko -->
+								<!-- ko if: simpleAttachmentsList -->
+								<ul class="attachmentListSimple" data-bind="foreach: message().listAttachments()">
+									<li class="attachmentItem" data-bind="attr: { 'title': fileName }, css: {'checked': checked}">
+										<span class="attachmentName" data-bind="text: fileName"></span>
+										<i class="checkboxAttachment fontastic"
+											data-bind="visible: download, text: checked() ? '☑' : '☐',
+											click: function () { checked(!checked()); return false }"></i>
+									</li>
+								</ul>
+								<!-- /ko -->
 								<i class="fontastic controls-handle" data-bind="visible: allowAttachmentControls(), click: toggleAttachmentControls">⚙</i>
-							</div>
+							</details>
 
 							<div class="attachmentsControls"
 								data-bind="visible: showAttachmentControls() && message().hasAttachments()">
@@ -275,6 +280,9 @@
 										data-i18n="MESSAGE/LINK_DOWNLOAD_AS_ZIP"></span>
 								</span>
 							</div>
+
+							<div class="showImages" data-bind="visible: message().hasImages(), click: showImages"
+								data-icon="🖼" data-i18n="MESSAGE/BUTTON_SHOW_IMAGES"></div>
 						</div>
 
 						<div class="openpgp-control encrypted" data-bind="visible: message().pgpEncrypted(), css: {'success': message().pgpDecrypted()}">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
index 1f6922fc9..acda0b238 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
@@ -124,7 +124,7 @@
 			<tr>
 				<td data-i18n="GLOBAL/SUBJECT"></div>
 				<td>
-					<input type="text" size="70" autocomplete="off" data-bind="textInput: subject">
+					<input type="text" name="subject" autocomplete="off" data-bind="textInput: subject">
 				</td>
 			</tr>
 		</table>
@@ -185,7 +185,7 @@
 			data-i18n="COMPOSE/NO_ATTACHMENTS_HERE_DESC"></div>
 	</div>
 
-	<div class="textAreaParent" data-bind="visible: 'body' == viewArea(), initDom: editorArea"></div>
+	<div class="textAreaParent" data-bind="visible: 'body' == viewArea(), initDom: editorArea, attr:{spellcheck:allowSpellcheck()?'true':'false'}"></div>
 
 	<div class="textAreaParent" id="mailvelope-editor" data-bind="visible: 'mailvelope' == viewArea()"></div>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
index 861e25999..e80b2e0b9 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
@@ -109,6 +109,13 @@
 					value: pgpEncrypt
 				}
 			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'COMPOSE/ALLOW_SPELLCHECK',
+					value: allowSpellcheck
+				}
+			}"></div>
 		</div>
 	</div>
 
@@ -158,6 +165,13 @@
 					value: listInlineAttachments
 				}
 			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/LIST_SIMPLE_ATTACHMENTS',
+					value: simpleAttachmentsList
+				}
+			}"></div>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
@@ -173,13 +187,12 @@
 	<div class="control-group">
 		<div>
 			<div>
-				<div data-bind="component: {
+				<div style="display: inline-block;" data-bind="component: {
 					name: 'Checkbox',
 					params: {
 						label: 'SETTINGS_GENERAL/CHROME_NOTIFICATION_DESC',
 						value: desktopNotification,
-						enable: isDesktopNotificationAllowed,
-						inline: true
+						enable: isDesktopNotificationAllowed
 					}
 				}"></div>
 				&nbsp;
@@ -187,12 +200,11 @@
 				<span class="fontastic" data-bind="click: testSystemNotification" style="color:green;cursor:pointer">▶️</span>
 			</div>
 			<div>
-				<div data-bind="component: {
+				<div style="display: inline-block;" data-bind="component: {
 					name: 'Checkbox',
 					params: {
 						label: 'SETTINGS_GENERAL/SOUND_NOTIFICATION',
-						value: soundNotification,
-						inline: true
+						value: soundNotification
 					}
 				}"></div>
 				&nbsp;
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
index 68fb56437..a2143ff34 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
@@ -1,9 +1,7 @@
 <nav class="b-content" data-bind="foreach: menu">
 	<a data-bind="css: {'selected': selected }, attr: { 'href': $root.link(route), 'data-i18n': label }"></a>
 </nav>
-<div class="b-content show-on-panel-disabled" data-bind="click: leftPanelDisabled.toggle()"></div>
+<div class="b-content show-on-panel-disabled" data-bind="click: toggleLeftPanel"></div>
 <div class="b-footer">
-	<a class="btn" data-bind="click: leftPanelDisabled.toggle()">
-		<i data-bind="css: {'icon-resize-out': leftPanelDisabled(), 'icon-resize-in': !leftPanelDisabled()}"></i>
-	</a>
+	<a class="btn fontastic" data-bind="click: toggleLeftPanel, text: leftPanelDisabled() ? '❯' : '❮'"></a>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
index eebf0d84b..55557fd5a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
@@ -1,7 +1,7 @@
 <div class="btn-toolbar">
 	<!-- ko if: isMobile() -->
 	<div class="btn-group" style="margin-left: -1px">
-		<a class="btn btn-thin fontastic toggleLeft" data-bind="click: leftPanelDisabled.toggle, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
+		<a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
 	</div>
 	<!-- /ko -->
 	<a class="btn" data-bind="click: backToInbox" data-icon="⬅" data-i18n="GLOBAL/BACK"></a>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
index 7f1dd2633..45a67e77b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
@@ -5,7 +5,6 @@
 		<div data-bind="component: {
 			name: 'Select',
 			params: {
-				inline: true,
 				options: autoLogoutOptions,
 				value: autoLogout,
 				trigger: autoLogoutTrigger,
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
index ef5529923..6be176e63 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
@@ -39,10 +39,7 @@
 				<a href="#" tabindex="-1" data-bind="click: settingsClick" data-icon="⚙" data-i18n="TOP_TOOLBAR/BUTTON_SETTINGS"></a>
 			</li>
 			<li role="presentation">
-				<a href="#" tabindex="-1" data-bind="click: settingsHelp">
-					<i class="icon-help"></i>
-					<span data-i18n="TOP_TOOLBAR/BUTTON_HELP"></span>
-				</a>
+				<a href="#" tabindex="-1" data-bind="click: settingsHelp" data-icon="🛈" data-i18n="TOP_TOOLBAR/BUTTON_HELP"></a>
 			</li>
 			<li class="dividerbar" role="presentation">
 				<a href="#" tabindex="-1" data-bind="click: toggleLayout" data-icon="💻" class="show-mobile" data-i18n="MOBILE/BUTTON_DESKTOP_VERSION"></a>
diff --git a/snappymail/v/0.0.0/cpanel.php b/snappymail/v/0.0.0/cpanel.php
new file mode 100644
index 000000000..dabb72ff9
--- /dev/null
+++ b/snappymail/v/0.0.0/cpanel.php
@@ -0,0 +1,35 @@
+<?php
+
+// cPanel https://github.com/the-djmaze/snappymail/issues/697
+if (defined('APP_PLUGINS_PATH') && !empty($_ENV['CPANEL']) && !is_dir(APP_PLUGINS_PATH.'login-remote')) {
+	$asApi = $_ENV['SNAPPYMAIL_INCLUDE_AS_API'];
+	$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+
+	\SnappyMail\Repository::installPackage('plugin', 'login-remote');
+
+	$aList = \SnappyMail\Repository::getEnabledPackagesNames();
+	$aList[] = 'login-remote';
+	$oConfig = \RainLoop\Api::Config();
+	$oConfig->Set('plugins', 'enable', true);
+	$oConfig->Set('plugins', 'enabled_list', \implode(',', \array_unique($aList)));
+	$oConfig->Set('login', 'default_domain', 'cpanel');
+	$oConfig->Set('logs', 'path', $_ENV['HOME'] . '/logs/snappymail');
+	$oConfig->Set('cache', 'path', $_ENV['HOME'] . '/tmp/snappymail');
+	$oConfig->Save();
+
+	$sFile = APP_PRIVATE_DATA.'domains/cpanel.json';
+	if (!file_exists($sFile)) {
+		$config = json_decode(file_get_contents(__DIR__ . '/app/domains/default.json'), true);
+		$config['IMAP']['shortLogin'] = true;
+		$config['SMTP']['shortLogin'] = true;
+		file_put_contents($sFile, json_encode($config, JSON_PRETTY_PRINT));
+	}
+
+//	\RainLoop\Api::Actions()->Plugins()->loadPlugin('login-remote');
+	if (!isset($_GET['installed'])) {
+		\header('Location: ?RemoteAutoLogin&installed');
+		exit;
+	}
+
+	$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = $asApi;
+}
diff --git a/snappymail/v/0.0.0/include.php b/snappymail/v/0.0.0/include.php
index 1a1f853e4..f1577d535 100644
--- a/snappymail/v/0.0.0/include.php
+++ b/snappymail/v/0.0.0/include.php
@@ -52,13 +52,10 @@ define('APP_VERSION_ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 
 date_default_timezone_set('UTC');
 
-define('APP_DUMMY', '********');
-
 $sCustomDataPath = '';
 $sCustomConfiguration = '';
 
-if (is_file(APP_INDEX_ROOT_PATH.'include.php'))
-{
+if (is_file(APP_INDEX_ROOT_PATH.'include.php')) {
 	include_once APP_INDEX_ROOT_PATH.'include.php';
 }
 
@@ -73,16 +70,22 @@ define('APP_PRIVATE_DATA_NAME', $sPrivateDataFolderInternalName ?: '_default_');
 unset($sPrivateDataFolderInternalName);
 
 if (!defined('APP_DATA_FOLDER_PATH')) {
-	$sCustomDataPath = function_exists('__get_custom_data_full_path') ? rtrim(trim(__get_custom_data_full_path()), '\\/') : $sCustomDataPath;
+	// cPanel https://github.com/the-djmaze/snappymail/issues/697
+	if (!empty($_ENV['CPANEL']) && isset($_ENV['HOME'])) {
+		$sCustomDataPath = $_ENV['HOME'] . '/var/snappymail';
+//		$sCustomDataPath = $_ENV['TMPDIR'] . '/snappymail';
+	} else {
+		$sCustomDataPath = function_exists('__get_custom_data_full_path') ? rtrim(trim(__get_custom_data_full_path()), '\\/') : $sCustomDataPath;
+	}
 	define('APP_DATA_FOLDER_PATH', strlen($sCustomDataPath) ? $sCustomDataPath.'/' : APP_INDEX_ROOT_PATH.'data/');
-	unset($sCustomDataPath);
 }
+unset($sCustomDataPath);
 
 if (!defined('APP_CONFIGURATION_NAME')) {
 	define('APP_CONFIGURATION_NAME', function_exists('__get_additional_configuration_name')
 		? trim(__get_additional_configuration_name()) : $sCustomConfiguration);
-	unset($sCustomConfiguration);
 }
+unset($sCustomConfiguration);
 
 $sData = is_file(APP_DATA_FOLDER_PATH.'DATA.php') ? file_get_contents(APP_DATA_FOLDER_PATH.'DATA.php') : '';
 define('APP_PRIVATE_DATA', APP_DATA_FOLDER_PATH.'_data_'.($sData ? md5($sData) : '').'/'.APP_PRIVATE_DATA_NAME.'/');
@@ -160,6 +163,11 @@ if (!ini_get('zlib.output_compression') && !ini_get('brotli.output_compression')
 	}
 }
 
+// cPanel https://github.com/the-djmaze/snappymail/issues/697
+if (!empty($_ENV['CPANEL']) && !is_dir(APP_PLUGINS_PATH.'login-remote')) {
+	require __DIR__ . '/cpanel.php';
+}
+
 if (class_exists('RainLoop\\Api')) {
 	RainLoop\Api::Handle();
 	// NextCloud/OwnCloud?
diff --git a/snappymail/v/0.0.0/setup.php b/snappymail/v/0.0.0/setup.php
index 89e52397d..c74f4ee9b 100644
--- a/snappymail/v/0.0.0/setup.php
+++ b/snappymail/v/0.0.0/setup.php
@@ -29,7 +29,8 @@ if (defined('APP_VERSION'))
 		'tidy' => extension_loaded('tidy'),
 		'uuid' => extension_loaded('uuid'),
 		'xxtea' => extension_loaded('xxtea'),
-		'zip' => extension_loaded('zip')
+		'zip' => extension_loaded('zip'),
+		'finfo' => class_exists('finfo')
 	);
 
 	$aRequirements = array(
@@ -134,7 +135,7 @@ if (defined('APP_VERSION'))
 		clearstatcache();
 	}
 
-	foreach (array('logs', 'cache', 'configs', 'domains', 'plugins', 'storage') as $sName)
+	foreach (array('configs', 'domains', 'plugins', 'storage') as $sName)
 	{
 		if (!is_dir(APP_PRIVATE_DATA.$sName))
 		{
@@ -160,8 +161,8 @@ if (defined('APP_VERSION'))
 		$sFile = APP_PRIVATE_DATA.'domains/'.$sName.'.json';
 		if (!file_exists($sFile) && !file_exists(APP_PRIVATE_DATA.'domains/'.$sName.'.ini')) {
 			$config = json_decode(file_get_contents(__DIR__ . '/app/domains/default.json'), true);
-			$config['imapShortLogin'] = true;
-			$config['smtpShortLogin'] = true;
+			$config['IMAP']['shortLogin'] = true;
+			$config['SMTP']['shortLogin'] = true;
 			file_put_contents($sFile, json_encode($config, JSON_PRETTY_PRINT));
 		}
 	}
diff --git a/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css b/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css
index 2ea19b377..4ff960a1d 100644
--- a/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css
+++ b/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css
@@ -172,7 +172,7 @@ input, textarea, .select, select, .emailaddresses {
     color: #fff;
 }
 .select, select {
-    background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='10px' width='15px'><text x='0' y='10' fill='rgb(255,255,255)'>▾</text></svg>");
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
 }
 
 hr {
diff --git a/snappymail/v/0.0.0/themes/SquaresDark/styles.css b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
index 39661fd04..8e418647e 100644
--- a/snappymail/v/0.0.0/themes/SquaresDark/styles.css
+++ b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
@@ -45,6 +45,11 @@
 
 	/* MESSAGE LIST */
 	--message-list-toolbar-bg-color: #222;
+
+	/* FORMS */
+	--input-clr: #fff;
+	--input-bg-clr: #000;
+	--input-border-clr: #aaa;
 }
 
 ::-webkit-scrollbar {
@@ -144,13 +149,8 @@
 	background: linear-gradient(#555 0%, #000 100%);
 }
 
-input, textarea, .select, select, .emailaddresses {
-	background-color: #000;
-	border-color: #aaa;
-	color: #fff;
-}
 .select, select {
-	background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='10px' width='15px'><text x='0' y='10' fill='rgb(255,255,255)'>▾</text></svg>");
+	background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
 }
 
 hr {
diff --git a/tasks/config.js b/tasks/config.js
index 78e60d7d6..99dd40a6a 100644
--- a/tasks/config.js
+++ b/tasks/config.js
@@ -67,6 +67,7 @@ config.paths.js = {
 			'vendors/jua/jua.js',
 			'vendors/bootstrap/js/bootstrap.native.js',
 			'vendors/knockout/build/output/knockout-latest.js',
+//			'vendors/knockout/build/output/knockout-latest.debug.js',
 			'vendors/squire/build/squire-raw.js',
 			'dev/External/SquireUI.js'
 		]
diff --git a/test/sasl.php b/test/sasl.php
new file mode 100644
index 000000000..f36d238e4
--- /dev/null
+++ b/test/sasl.php
@@ -0,0 +1,25 @@
+<?php
+//$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+//require '../index.php';
+
+define('SNAPPYMAIL_LIBRARIES_PATH', dirname(__DIR__) . '/snappymail/v/0.0.0/app/libraries');
+if (false === set_include_path(SNAPPYMAIL_LIBRARIES_PATH . PATH_SEPARATOR . get_include_path())) {
+	exit('set_include_path() failed. Probably due to Apache config using php_admin_value instead of php_value');
+}
+spl_autoload_extensions('.php');
+/** lowercase autoloader */
+spl_autoload_register();
+/** case-sensitive autoloader */
+spl_autoload_register(function($sClassName){
+	$file = SNAPPYMAIL_LIBRARIES_PATH . strtr($sClassName, '\\', DIRECTORY_SEPARATOR) . '.php';
+//		if ($file = stream_resolve_include_path(strtr($sClassName, '\\', DIRECTORY_SEPARATOR) . '.php')) {
+	if (is_file($file)) {
+		include_once $file;
+	}
+});
+
+$LOGIN = new \SnappyMail\SASL\Login;
+$LOGIN->base64 = true;
+var_dump($LOGIN->authenticate('john', 'doe', 'VXNlcm5hbWU6'));
+var_dump($LOGIN->authenticate('john', 'doe', 'VXNlcm5hbWU6CG'));
+var_dump($LOGIN->authenticate('john', 'doe', 'UGFzc3dvcmQ6'));
diff --git a/vendors/bootstrap/less/buttons.less b/vendors/bootstrap/less/buttons.less
index 8b2b71ead..5f208a925 100644
--- a/vendors/bootstrap/less/buttons.less
+++ b/vendors/bootstrap/less/buttons.less
@@ -11,8 +11,8 @@
   border-radius: 3px;
 
   display: inline-block;
-  padding: 4px 12px;
-  line-height: 1.43em;
+  padding: 0 12px;
+  line-height: 2em;
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
@@ -74,10 +74,8 @@
 // Block button
 .btn-block {
   display: block;
-  width: 100%;
   padding-left: 0;
   padding-right: 0;
-  box-sizing: border-box;
 }
 
 
diff --git a/vendors/bootstrap/less/forms.less b/vendors/bootstrap/less/forms.less
index f88683d3e..267f48c45 100644
--- a/vendors/bootstrap/less/forms.less
+++ b/vendors/bootstrap/less/forms.less
@@ -41,7 +41,6 @@ select,
 .select,
 textarea,
 input {
-  box-sizing: border-box;
   display: inline-block;
   padding: 4px 6px;
   color: var(--input-clr, #555);
@@ -84,7 +83,7 @@ select, .select {
   // Safari requires -webkit-
   -webkit-appearance: none;
   appearance: none;
-  background: var(--input-bg-clr, #fff) url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='10px' width='15px'><text x='0' y='10' fill='rgb(85,85,85)'>▾</text></svg>") right center/1em no-repeat border-box;
+  background: var(--input-bg-clr, #fff) url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoODUsODUsODUpJz7ilr48L3RleHQ+PC9zdmc+) right center/1em no-repeat border-box;
   border: 1px solid var(--input-border-clr, #ccc);
   cursor: pointer;
   padding-right: 1.5em;
diff --git a/vendors/bootstrap/less/mixins.less b/vendors/bootstrap/less/mixins.less
index dd06b8441..8ecce7784 100644
--- a/vendors/bootstrap/less/mixins.less
+++ b/vendors/bootstrap/less/mixins.less
@@ -24,7 +24,6 @@
   display: block;
   width: 100%;
   min-height: 30px;        // Make inputs at least the height of their button counterpart
-  box-sizing: border-box; // Makes inputs behave like true block-level elements
 }
 
 
diff --git a/vendors/bootstrap/less/type.less b/vendors/bootstrap/less/type.less
index 986b5f068..a79d01b67 100644
--- a/vendors/bootstrap/less/type.less
+++ b/vendors/bootstrap/less/type.less
@@ -71,7 +71,6 @@ hr {
   margin: 1.43em 0;
   border: 0;
   border-bottom: 1px solid var(--hr-color, #eee);
-  box-sizing: content-box;
   height: 0;
 }
 
diff --git a/vendors/fontastic/fonts/snappymail.woff b/vendors/fontastic/fonts/snappymail.woff
index d5f7689e5..40a8f1c0e 100644
Binary files a/vendors/fontastic/fonts/snappymail.woff and b/vendors/fontastic/fonts/snappymail.woff differ
diff --git a/vendors/fontastic/fonts/snappymail.woff2 b/vendors/fontastic/fonts/snappymail.woff2
index 812fbe14c..9a699fb4d 100644
Binary files a/vendors/fontastic/fonts/snappymail.woff2 and b/vendors/fontastic/fonts/snappymail.woff2 differ
diff --git a/vendors/fontastic/styles.css b/vendors/fontastic/styles.css
index 01d4ac0e8..0faf4e8e5 100644
--- a/vendors/fontastic/styles.css
+++ b/vendors/fontastic/styles.css
@@ -41,13 +41,13 @@
   content: "\e007";
 }
 .icon-right-mini::before {
-  content: "\e01e"; /* › */
+  content: "›";
 }
 .icon-down-mini::before {
-  content: "\e01f"; /* › rotate 90 */
+  content: "⌄";
 }
-.icon-warning-alt::before {
-  content: "\e02a";
+.icon-cross::before {
+  content: "✖";
 }
 .icon-ok::before {
   content: "✔";
@@ -91,12 +91,6 @@
 .icon-lock::before {
   content: "🔒";
 }
-.icon-popup::before {
-  content: "\e045";
-}
-.icon-mail::before {
-  content: "✉";
-}
 .icon-filter::before {
   content: "\e061"; /* ⊆ */
 }
@@ -109,15 +103,6 @@
 .icon-copy::before {
   content: "\e068";
 }
-.icon-help::before {
-  content: "\e06b";
-}
-.icon-resize-in::before {
-  content: "\e06c";
-}
-.icon-resize-out::before {
-  content: "⤢";
-}
 .icon-check-mark-circle-two::before {
   content: "\e073";
 }
diff --git a/vendors/knockout/build/output/knockout-latest.debug.js b/vendors/knockout/build/output/knockout-latest.debug.js
index 70cd7b60f..3a5ee51e5 100644
--- a/vendors/knockout/build/output/knockout-latest.debug.js
+++ b/vendors/knockout/build/output/knockout-latest.debug.js
@@ -2698,7 +2698,7 @@ ko.bindingHandlers['options'] = {
             if (allBindings['has']('optionsCaption')) {
                 captionValue = ko.utils.unwrapObservable(allBindings.get('optionsCaption'));
                 // If caption value is null or undefined, don't show a caption
-                if (captionValue !== null && captionValue !== undefined) {
+                if (captionValue != null) {
                     filteredArray.unshift(captionPlaceholder);
                 }
             }
diff --git a/vendors/knockout/build/output/knockout-latest.js b/vendors/knockout/build/output/knockout-latest.js
index 23dc8d166..11b5a0120 100644
--- a/vendors/knockout/build/output/knockout-latest.js
+++ b/vendors/knockout/build/output/knockout-latest.js
@@ -52,14 +52,14 @@ typeof k&&a.addEventListener(k,(...e)=>{var g=b()[k];if(g)try{f=l.$data;var h=g.
 k=>{a.__ko_hasfocusUpdating=!0;k=a.ownerDocument.activeElement===a;c.I.ob(b(),d,"hasfocus",k,!0);a.__ko_hasfocusLastValue=k;a.__ko_hasfocusUpdating=!1},l=f.bind(null,!0);f=f.bind(null,!1);a.addEventListener("focus",l);a.addEventListener("focusin",l);a.addEventListener("blur",f);a.addEventListener("focusout",f);a.__ko_hasfocusLastValue=!1},update:(a,b)=>{b=!!c.g.j(b());a.__ko_hasfocusUpdating||a.__ko_hasfocusLastValue===b||(b?a.focus():a.blur())}};c.I.mb.add("hasfocus");c.h.html={init:()=>({controlsDescendantBindings:!0}),
 update:(a,b)=>{c.g.$a(a);b=c.g.j(b());if(null!=b){const d=M.createElement("template");d.innerHTML="string"!=typeof b?b.toString():b;a.appendChild(d.content)}}};(()=>{function a(b,d,f){c.h[b]={init:(l,k,e,g,h)=>{var n,p={};d&&(p={as:e.get("as"),exportDependencies:!0});var m=e.has(c.l.ga);c.s(()=>{var r=c.g.j(k()),q=!f!==!r,t=!n;m&&(h=c.l.kb(l,h));if(q){p.dataDependency=c.u.s();var u=d?h.createChildContext("function"==typeof r?r:k,p):c.u.Ba()?h.extend(null,p):h}t&&c.u.Ba()&&(n=c.g.xa(c.m.childNodes(l),
 !0));q?(t||c.m.ta(l,c.g.xa(n)),c.yb(u,l)):(c.m.pa(l),c.l.notify(l,c.l.G))},{o:l});return{controlsDescendantBindings:!0}}};c.I.Sa[b]=!1;c.m.ca[b]=!0}a("if");a("ifnot",!1,!0);a("with",!0)})();var U={};c.h.options={init:a=>{if(!a.matches("SELECT"))throw Error("options binding applies only to SELECT elements");let b=a.length;for(;b--;)a.remove(b);return{controlsDescendantBindings:!0}},update:(a,b,d)=>{var f=a.multiple,l=0!=a.length&&f?a.scrollTop:null,k=c.g.j(b()),e=d.get("valueAllowUnset")&&d.has("value"),
-g={},h=[];b=()=>Array.from(a.options).filter(q=>q.selected);var n=(q,t,u)=>{var w=typeof t;return"function"==w?t(q):"string"==w?q[t]:u},p=(q,t)=>{r&&e?c.l.notify(a,c.l.G):h.length&&(q=h.includes(c.F.R(t[0])),t[0].selected=q,r&&!q&&c.u.S(c.g.Sb,null,[a,"change"]))};e||(f?h=b().map(c.F.R):0<=a.selectedIndex&&h.push(c.F.R(a.options[a.selectedIndex])));if(k){"undefined"==typeof k.length&&(k=[k]);var m=k.filter(q=>q||null==q);d.has("optionsCaption")&&(k=c.g.j(d.get("optionsCaption")),null!==k&&void 0!==
-k&&m.unshift(U))}var r=!1;g.beforeRemove=q=>a.removeChild(q);k=p;d.has("optionsAfterRender")&&"function"==typeof d.get("optionsAfterRender")&&(k=(q,t)=>{p(q,t);c.u.S(d.get("optionsAfterRender"),null,[t[0],q!==U?q:void 0])});c.g.Pb(a,m,(q,t,u)=>{u.length&&(h=!e&&u[0].selected?[c.F.R(u[0])]:[],r=!0);t=a.ownerDocument.createElement("option");q===U?(c.g.jb(t,d.get("optionsCaption")),c.F.Na(t,void 0)):(u=n(q,d.get("optionsValue"),q),c.F.Na(t,c.g.j(u)),q=n(q,d.get("optionsText"),u),c.g.jb(t,q));return[t]},
-g,k);e||(m=h.length,(f?m&&b().length<m:m&&0<=a.selectedIndex?c.F.R(a.options[a.selectedIndex])!==h[0]:m||0<=a.selectedIndex)&&c.u.S(c.g.Sb,null,[a,"change"]));(e||c.u.eb())&&c.l.notify(a,c.l.G);l&&20<Math.abs(l-a.scrollTop)&&(a.scrollTop=l)}};c.h.options.gb=c.g.i.Z();c.h.style={update:(a,b)=>{c.g.O(c.g.j(b()||{}),(d,f)=>{f=c.g.j(f);if(null==f||!1===f)f="";if(/^--/.test(d))a.style.setProperty(d,f);else{d=d.replace(/-(\w)/g,(k,e)=>e.toUpperCase());var l=a.style[d];a.style[d]=f;f===l||a.style[d]!=l||
-isNaN(f)||(a.style[d]=f+"px")}})}};c.h.submit={init:(a,b,d,f,l)=>{if("function"!=typeof b())throw Error("The value for a submit binding must be a function");a.addEventListener("submit",k=>{var e=b();try{var g=e.call(l.$data,a)}finally{!0!==g&&k.preventDefault()}})}};c.h.text={init:()=>({controlsDescendantBindings:!0}),update:(a,b)=>{8===a.nodeType&&(a.text||a.after(a.text=M.createTextNode("")),a=a.text);c.g.jb(a,b())}};c.m.ca.text=!0;c.h.textInput={init:(a,b,d)=>{var f=a.value,l,k,e=()=>{clearTimeout(l);
-k=l=void 0;var h=a.value;f!==h&&(f=h,c.I.ob(b(),d,"textInput",h))},g=()=>{var h=c.g.j(b());null==h&&(h="");void 0!==k&&h===k?setTimeout(g,4):a.value!==h&&(a.value=h,f=a.value)};a.addEventListener("input",e);a.addEventListener("change",e);a.addEventListener("blur",e);c.s(g,{o:a})}};c.I.mb.add("textInput");c.h.textinput={preprocess:(a,b,d)=>d("textInput",a)};c.h.value={init:(a,b,d)=>{var f=a.matches("SELECT"),l=a.matches("INPUT");if(!l||"checkbox"!=a.type&&"radio"!=a.type){var k=new Set,e=d.get("valueUpdate"),
-g=null,h=()=>{g=null;var m=b(),r=c.F.R(a);c.I.ob(m,d,"value",r)};e&&("string"==typeof e?k.add(e):e.forEach(m=>k.add(m)),k.delete("change"));k.forEach(m=>{var r=h;(m||"").startsWith("after")&&(r=()=>{g=c.F.R(a);setTimeout(h,0)},m=m.slice(5));a.addEventListener(m,r)});var n=l&&"file"==a.type?()=>{var m=c.g.j(b());null==m||""===m?a.value="":c.u.S(h)}:()=>{var m=c.g.j(b()),r=c.F.R(a);if(null!==g&&m===g)setTimeout(n,0);else if(m!==r||void 0===r)f?(r=d.get("valueAllowUnset"),c.F.Na(a,m,r),r||m===c.F.R(a)||
-c.u.S(h)):c.F.Na(a,m)};if(f){var p;c.l.subscribe(a,c.l.G,()=>{p?d.get("valueAllowUnset")?n():h():(a.addEventListener("change",h),p=c.s(n,{o:a}))},null,{notifyImmediately:!0})}else a.addEventListener("change",h),c.s(n,{o:a})}else c.wb(a,{checkedValue:b})},update:()=>{}};c.I.mb.add("value");c.h.visible={update:(a,b)=>{b=c.g.j(b());var d="none"!=a.style.display;b&&!d?a.style.display="":d&&!b&&(a.style.display="none")}};c.h.hidden={update:(a,b)=>a.hidden=!!c.g.j(b())};(function(a){c.h[a]={init:function(b,
-d,f,l,k){return c.h.event.init.call(this,b,()=>({[a]:d()}),f,l,k)}}})("click");(()=>{let a=c.g.i.Z();class b{constructor(f){this.Xa=f}Ja(...f){let l=this.Xa;if(!f.length)return c.g.i.get(l,a)||(11===this.L?l.content:1===this.L?l:void 0);c.g.i.set(l,a,f[0])}}class d extends b{constructor(f){super(f);f&&(this.L=f.matches("TEMPLATE")&&f.content?f.content.nodeType:1)}}c.Ka={Xa:d,Qa:b}})();(()=>{var a=(e,g,h)=>{var n;for(g=c.m.nextSibling(g);e&&(n=e)!==g;)e=c.m.nextSibling(n),h(n,e)},b=(e,g)=>{if(e.length){var h=
+g={},h=[];b=()=>Array.from(a.options).filter(q=>q.selected);var n=(q,t,u)=>{var w=typeof t;return"function"==w?t(q):"string"==w?q[t]:u},p=(q,t)=>{r&&e?c.l.notify(a,c.l.G):h.length&&(q=h.includes(c.F.R(t[0])),t[0].selected=q,r&&!q&&c.u.S(c.g.Sb,null,[a,"change"]))};e||(f?h=b().map(c.F.R):0<=a.selectedIndex&&h.push(c.F.R(a.options[a.selectedIndex])));if(k){"undefined"==typeof k.length&&(k=[k]);var m=k.filter(q=>q||null==q);d.has("optionsCaption")&&(k=c.g.j(d.get("optionsCaption")),null!=k&&m.unshift(U))}var r=
+!1;g.beforeRemove=q=>a.removeChild(q);k=p;d.has("optionsAfterRender")&&"function"==typeof d.get("optionsAfterRender")&&(k=(q,t)=>{p(q,t);c.u.S(d.get("optionsAfterRender"),null,[t[0],q!==U?q:void 0])});c.g.Pb(a,m,(q,t,u)=>{u.length&&(h=!e&&u[0].selected?[c.F.R(u[0])]:[],r=!0);t=a.ownerDocument.createElement("option");q===U?(c.g.jb(t,d.get("optionsCaption")),c.F.Na(t,void 0)):(u=n(q,d.get("optionsValue"),q),c.F.Na(t,c.g.j(u)),q=n(q,d.get("optionsText"),u),c.g.jb(t,q));return[t]},g,k);e||(m=h.length,
+(f?m&&b().length<m:m&&0<=a.selectedIndex?c.F.R(a.options[a.selectedIndex])!==h[0]:m||0<=a.selectedIndex)&&c.u.S(c.g.Sb,null,[a,"change"]));(e||c.u.eb())&&c.l.notify(a,c.l.G);l&&20<Math.abs(l-a.scrollTop)&&(a.scrollTop=l)}};c.h.options.gb=c.g.i.Z();c.h.style={update:(a,b)=>{c.g.O(c.g.j(b()||{}),(d,f)=>{f=c.g.j(f);if(null==f||!1===f)f="";if(/^--/.test(d))a.style.setProperty(d,f);else{d=d.replace(/-(\w)/g,(k,e)=>e.toUpperCase());var l=a.style[d];a.style[d]=f;f===l||a.style[d]!=l||isNaN(f)||(a.style[d]=
+f+"px")}})}};c.h.submit={init:(a,b,d,f,l)=>{if("function"!=typeof b())throw Error("The value for a submit binding must be a function");a.addEventListener("submit",k=>{var e=b();try{var g=e.call(l.$data,a)}finally{!0!==g&&k.preventDefault()}})}};c.h.text={init:()=>({controlsDescendantBindings:!0}),update:(a,b)=>{8===a.nodeType&&(a.text||a.after(a.text=M.createTextNode("")),a=a.text);c.g.jb(a,b())}};c.m.ca.text=!0;c.h.textInput={init:(a,b,d)=>{var f=a.value,l,k,e=()=>{clearTimeout(l);k=l=void 0;var h=
+a.value;f!==h&&(f=h,c.I.ob(b(),d,"textInput",h))},g=()=>{var h=c.g.j(b());null==h&&(h="");void 0!==k&&h===k?setTimeout(g,4):a.value!==h&&(a.value=h,f=a.value)};a.addEventListener("input",e);a.addEventListener("change",e);a.addEventListener("blur",e);c.s(g,{o:a})}};c.I.mb.add("textInput");c.h.textinput={preprocess:(a,b,d)=>d("textInput",a)};c.h.value={init:(a,b,d)=>{var f=a.matches("SELECT"),l=a.matches("INPUT");if(!l||"checkbox"!=a.type&&"radio"!=a.type){var k=new Set,e=d.get("valueUpdate"),g=null,
+h=()=>{g=null;var m=b(),r=c.F.R(a);c.I.ob(m,d,"value",r)};e&&("string"==typeof e?k.add(e):e.forEach(m=>k.add(m)),k.delete("change"));k.forEach(m=>{var r=h;(m||"").startsWith("after")&&(r=()=>{g=c.F.R(a);setTimeout(h,0)},m=m.slice(5));a.addEventListener(m,r)});var n=l&&"file"==a.type?()=>{var m=c.g.j(b());null==m||""===m?a.value="":c.u.S(h)}:()=>{var m=c.g.j(b()),r=c.F.R(a);if(null!==g&&m===g)setTimeout(n,0);else if(m!==r||void 0===r)f?(r=d.get("valueAllowUnset"),c.F.Na(a,m,r),r||m===c.F.R(a)||c.u.S(h)):
+c.F.Na(a,m)};if(f){var p;c.l.subscribe(a,c.l.G,()=>{p?d.get("valueAllowUnset")?n():h():(a.addEventListener("change",h),p=c.s(n,{o:a}))},null,{notifyImmediately:!0})}else a.addEventListener("change",h),c.s(n,{o:a})}else c.wb(a,{checkedValue:b})},update:()=>{}};c.I.mb.add("value");c.h.visible={update:(a,b)=>{b=c.g.j(b());var d="none"!=a.style.display;b&&!d?a.style.display="":d&&!b&&(a.style.display="none")}};c.h.hidden={update:(a,b)=>a.hidden=!!c.g.j(b())};(function(a){c.h[a]={init:function(b,d,f,l,
+k){return c.h.event.init.call(this,b,()=>({[a]:d()}),f,l,k)}}})("click");(()=>{let a=c.g.i.Z();class b{constructor(f){this.Xa=f}Ja(...f){let l=this.Xa;if(!f.length)return c.g.i.get(l,a)||(11===this.L?l.content:1===this.L?l:void 0);c.g.i.set(l,a,f[0])}}class d extends b{constructor(f){super(f);f&&(this.L=f.matches("TEMPLATE")&&f.content?f.content.nodeType:1)}}c.Ka={Xa:d,Qa:b}})();(()=>{var a=(e,g,h)=>{var n;for(g=c.m.nextSibling(g);e&&(n=e)!==g;)e=c.m.nextSibling(n),h(n,e)},b=(e,g)=>{if(e.length){var h=
 e[0],n=h.parentNode;a(h,e[e.length-1],p=>{1!==p.nodeType&&8!==p.nodeType||c.xb(g,p)});c.g.Aa(e,n)}},d=(e,g,h,n)=>{var p=(e&&(e.nodeType?e:0<e.length?e[0]:null)||h||{}).ownerDocument;if("string"==typeof h){p=p||M;p=p.getElementById(h);if(!p)throw Error("Cannot find template with ID "+h);h=new c.Ka.Xa(p)}else if([1,8].includes(h.nodeType))h=new c.Ka.Qa(h);else throw Error("Unknown template type: "+h);h=(h=h.Ja?h.Ja():null)?[...h.cloneNode(!0).childNodes]:null;if("number"!=typeof h.length||0<h.length&&
 "number"!=typeof h[0].nodeType)throw Error("Template engine must return an array of DOM nodes");p=!1;switch(g){case "replaceChildren":c.m.ta(e,h);p=!0;break;case "ignoreTargetNode":break;default:throw Error("Unknown renderMode: "+g);}p&&(b(h,n),"replaceChildren"==g&&c.l.notify(e,c.l.G));return h},f=(e,g,h)=>c.T(e)?e():"function"===typeof e?e(g,h):e;c.rc=function(e,g,h,n){h=h||{};var p=p||"replaceChildren";if(n){var m=n.nodeType?n:0<n.length?n[0]:null;return c.s(()=>{var r=g instanceof c.ea?g:new c.ea(g,
 null,null,null,{exportDependencies:!0}),q=f(e,r.$data,r);d(n,p,q,r,h)},{oa:()=>!m||!c.g.Za(m),o:m})}console.log("no targetNodeOrNodeArray")};c.sc=(e,g,h,n,p)=>{function m(v,z){c.u.S(c.g.Pb,null,[n,v,t,h,u,z]);c.l.notify(n,c.l.G)}var r,q=h.as,t=(v,z)=>{r=p.createChildContext(v,{as:q,extend:C=>{C.$index=z;q&&(C[q+"Index"]=z)}});v=f(e,v,r);return d(n,"ignoreTargetNode",v,r,h)},u=(v,z)=>{b(z,r);r=null};if(!h.beforeRemove&&c.Jb(g)){m(g.P());var w=g.subscribe(v=>{m(g(),v)},null,"arrayChange");w.o(n);return w}return c.s(()=>
diff --git a/vendors/knockout/src/binding/defaultBindings/options.js b/vendors/knockout/src/binding/defaultBindings/options.js
index c3ba4f733..d4d478b73 100644
--- a/vendors/knockout/src/binding/defaultBindings/options.js
+++ b/vendors/knockout/src/binding/defaultBindings/options.js
@@ -73,7 +73,7 @@ ko.bindingHandlers['options'] = {
             if (allBindings['has']('optionsCaption')) {
                 captionValue = ko.utils.unwrapObservable(allBindings.get('optionsCaption'));
                 // If caption value is null or undefined, don't show a caption
-                if (captionValue !== null && captionValue !== undefined) {
+                if (captionValue != null) {
                     filteredArray.unshift(captionPlaceholder);
                 }
             }
diff --git a/vendors/squire/build/squire-raw.js b/vendors/squire/build/squire-raw.js
index 61efab092..1273671bd 100644
--- a/vendors/squire/build/squire-raw.js
+++ b/vendors/squire/build/squire-raw.js
@@ -2007,15 +2007,15 @@ function onPaste ( event ) {
 		});
 		if (htmlItem || plainItem || imageItem) {
 			event.preventDefault();
-			if ( htmlItem && ( !self.isShiftDown || !plainItem ) ) {
-				htmlItem.getAsString( html => self.insertHTML( html, true ) );
-			} else if ( plainItem ) {
-				plainItem.getAsString( text => self.insertPlainText( text, true ) );
-			} else if ( imageItem ) {
+			if ( imageItem ) {
 				let reader = new FileReader();
 				reader.onload = event =>
 					self.insertHTML( '<img src="'+event.target.result+'">', true );
 				reader.readAsDataURL(imageItem.getAsFile());
+			} else if ( htmlItem && ( !self.isShiftDown || !plainItem ) ) {
+				htmlItem.getAsString( html => self.insertHTML( html, true ) );
+			} else if ( plainItem ) {
+				plainItem.getAsString( text => self.insertPlainText( text, true ) );
 			}
 		}
 	}