diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8946f2a5e..691acb47d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 2.35.0 – 2024-02-20
+
+### Added
+- S/MIME support
+  [#259](https://github.com/the-djmaze/snappymail/issues/259)
+
+### Changed
+- Disable IMAP METADATA by default (hardly used)
+- Update Polish translation by @tinola
+- Rename CSS .openpgp-control to .crypto-control
+- Renamed some methods in PHP
+
+### Fixed
+- When moving a folder/mailbox check for parent delimiter
+- Mask `passphrase` in the logs for PHP < 8.2
+- Added some missing translations
+- Sign messages using PGP
+- Check for CONDSTORE or QRESYNC to get the HIGHESTMODSEQ
+- Unable to login on certain IMAP server since 2.34.2
+  [#1438](https://github.com/the-djmaze/snappymail/issues/1438)
+
+### Nextcloud
+- Save as .eml
+  [#1425](https://github.com/the-djmaze/snappymail/issues/1425)
+
+
 ## 2.34.2 – 2024-02-14
 
 ### Fixed
diff --git a/README.md b/README.md
index ae156f7d6..b582d07b4 100644
--- a/README.md
+++ b/README.md
@@ -140,26 +140,26 @@ RainLoop 1.17 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.170.153	|   81.613	|
-|app.js          	|4.207.787	|  421.481	|
+|admin.js        	|2.170.153	|   81.641	|
+|app.js          	|4.207.787	|  426.852	|
 |boot.js         	|  868.735	|    4.142	|
 |libs.js         	|  658.812	|  192.625	|
 |sieve.js         	|        0	|   84.707	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  784.853	|
+|TOTAL           	|8.240.095	|  790.252	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  256.831	|   40.119	| 73.606	| 13.425	| 60.877  	| 12.028	|
-|app.min.js      	|  515.367	|  190.884	|139.456	| 64.643	|110.485  	| 55.533	|
+|admin.min.js    	|  256.831	|   40.142	| 73.606	| 13.445	| 60.877  	| 12.047	|
+|app.min.js      	|  515.367	|  193.738	|139.456	| 65.570	|110.485  	| 56.281	|
 |boot.min.js     	|   84.659	|    2.084	| 26.998	|  1.202	| 23.643  	|  1.003	|
 |libs.min.js     	|  584.772	|   92.664	|180.901	| 34.414	|155.182  	| 30.850	|
 |sieve.min.js     	|        0	|   41.164	|      0	| 10.365	|      0  	|  9.359	|
 |polyfills.min.js	|   32.837	|        0	| 11.406	|      0	| 10.175  	|      0	|
-|TOTAL user      	|1.217.635	|  285.632	|358.761	|100.259	|299.485  	| 87.386	|
-|TOTAL user+sieve	|1.217.635	|  326.796	|358.761	|110.624	|299.485  	| 96.745	|
-|TOTAL admin     	|  959.099	|  134.867	|292.911	| 49.041	|249.877  	| 43.881	|
+|TOTAL user      	|1.217.635	|  288.486	|358.761	|101.186	|299.485  	| 88.134	|
+|TOTAL user+sieve	|1.217.635	|  329.650	|358.761	|111.551	|299.485  	| 97.493	|
+|TOTAL admin     	|  959.099	|  134.890	|292.911	| 49.061	|249.877  	| 43.900	|
 
 For a user it is around 69% smaller and faster than traditional RainLoop.
 
@@ -188,8 +188,8 @@ For a user it is around 69% smaller and faster than traditional RainLoop.
 
 |css/*       	|RainLoop	|Snappy   	|RL gzip	|SM gzip	|SM brotli	|
 |------------	|-------:	|------:	|------:	|------:	|--------:	|
-|app.css     	| 340.331	| 84.444	| 46.946	| 17.613	| 15.077	|
-|app.min.css 	| 274.947	| 67.834	| 39.647	| 15.528	| 13.542	|
+|app.css     	| 340.331	| 84.435	| 46.946	| 17.612	| 15.091	|
+|app.min.css 	| 274.947	| 67.825	| 39.647	| 15.526	| 13.540	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
 |admin.css    	|       	| 30.576	|       	|  7.013	|  6.096	|
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 60de3c101..dd880b220 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.34.2</upstream>.
+This app packages SnappyMail <upstream>2.35.0</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 293de14ef..fa0c1dfba 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.34.2
+VERSION=2.35.0
 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/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 79969702a..d0cd260d7 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.34.2</version>
+	<version>2.35.0</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/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index 3741c74dd..1fb3ace20 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.34.2" );
+return ( "2.35.0" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 839f99724..f325ea0d8 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.34.2",
+  "version": "2.35.0",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",
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 4571fa2c2..de7a7d07e 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
@@ -68,7 +68,7 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Gebruikersnaam",
 		"LABEL_STORAGE_PASSWORD": "Wachtwoord",
-		"SQLITE_GLOBAL": "Use a global DB instead of per account",
+		"SQLITE_GLOBAL": "Gebruik een globale database in plaats van per account",
 		"ALERT_NOTICE": "Aandacht!",
 		"SUGGESTIONS_LIMIT": "Suggesties limiet",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Gegruik deze database soort niet met een groot aantal actieve gebrukers.",
@@ -136,7 +136,7 @@
 		"LABEL_USE_SHORT_LOGIN": "Gebruik verkorte login",
 		"LABEL_USE_AUTH": "Gebruik authenticatie",
 		"LABEL_SET_SENDER": "Gebruik login als verzender",
-		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
+		"LABEL_AUTH_PLAIN_LINE": "Forceer een enkele opdracht AUTH PLAIN-aanmelding",
 		"LABEL_USE_PHP_MAIL": "Gebruik php mail() functie",
 		"BUTTON_WHITE_LIST": "Witte lijst",
 		"BUTTON_SIEVE_CONFIGURATION": "Sieve configuratie",
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 e87210c82..3719f91e4 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
@@ -154,8 +154,8 @@
 		"HAS_VIRUS_WARNING": "WAARSCHUWING: virus gedetecteerd",
 		"TAGS": "Labels",
 		"NEW_TAG": "Nieuwe label",
-		"ENABLE_TRACKING_LINKS": "Enable tracking links",
-		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+		"ENABLE_TRACKING_LINKS": "Schakel trackinglinks in",
+		"TRACKING_ENABLED": "Links worden nu bijgehouden wanneer erop wordt geklikt!"
 	},
 	"MESSAGE_TAGS": {
 		"$important": "Belangrijk",
@@ -212,7 +212,7 @@
 		"ADD_MENU_TAGS": "Labels",
 		"BUTTON_SHARE_ALL": "Iedereen",
 		"BUTTON_SYNC": "Synchroniseren (CardDAV)",
-		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
+		"SEND_TO_ALL_CONTACT_EMAILS": "Verzend naar alle e-mailadressen"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "Toon alle velden",
@@ -281,8 +281,8 @@
 		"VERIFY": "Verifiëren",
 		"GOOD_SIGNATURE": "Juiste handtekening van %USER%",
 		"ERROR": "%TYPE% foutmelding: %ERROR%",
-		"CREATE_SELF_SIGNED": "Create self-signed",
-		"VALID_UNTIL": "Valid until"
+		"CREATE_SELF_SIGNED": "Zelfondertekend certificaat aanmaken",
+		"VALID_UNTIL": "Geldig tot"
 	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Importeer OpenPGP sleutel",
@@ -295,11 +295,11 @@
 		"SIGNED_MESSAGE": "OpenPGP ondertekend bericht",
 		"ENCRYPTED_MESSAGE": "OpenPGP versleuteld bericht",
 		"STORE_IN_GNUPG": "Bewaar op de server in GnuPG",
-		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
-		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Bewaar openbare sleutel op de server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Bewaar privésleutel op de server in GnuPG",
 		"BACKUP_ON_SERVER": "Bewaar (versleuteld) op de server",
-		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
-		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Maak een back-up van de openbare sleutel op de server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Maak een back-up van de privésleutel op de server"
 	},
 	"SMIME": {
 		"SIGNED_MESSAGE": "S\/MIME ondertekend bericht",
@@ -527,7 +527,7 @@
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importeer sleutel",
 		"BUTTON_GENERATE_KEY_PAIR": "Genereer sleutels",
-		"IMPORT_FROM_SERVER": "Import from server",
+		"IMPORT_FROM_SERVER": "Importeren vanaf de server",
 		"TITLE_PRIVATE": "Privé sleutel",
 		"TITLE_PUBLIC": "Publieke sleutel",
 		"GET_MAILVELOPE": "Verkrijg Mailvelope browser add-on."