diff --git a/CHANGELOG.md b/CHANGELOG.md
index a44beb9f8b..368c9238a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,29 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 3.5.0 – unreleased
+### Added
+- Emoji picker via : symbol
+- Smart picker integration via / symbol
+- Searching message bodies in advanced search
+- Warning about missing attachments
+- PHP8.3 support
+- Performance improvements through caching
+- Performance improvements of the dashboard widgets
+### Changed
+- Updated and new translations
+- App store screenshot
+### Fixed
+- Calendar event color picker
+- Thread summaries using preview text instead of full body text
+- Showing contact name in thread header
+- Stale and unused ML data in database and on storage
+- Unsubscribe button style
+- Modals closing automatically
+- Recipient searches in advanced search (to vs cc vs bcc)
+- Internal rate-limiting for wrong passwords to prevent IMAP locking
+- Double mailbox sync when navigating across two accounts
+
 ## 3.4.0-rc.1 - unreleased
 ### Added
 - Thread summaries
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 60fa463244..633986e8df 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -29,7 +29,7 @@ The rating depends on the installed text processing backend. See [the rating ove
 
 Learn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).
 	]]></description>
-	<version>3.5.0-alpha.2</version>
+	<version>3.5.0-beta.1</version>
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>
 	<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>
diff --git a/package-lock.json b/package-lock.json
index 291931ae81..26acc56499 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "nextcloud-mail",
-  "version": "3.5.0-alpha2",
+  "version": "3.5.0-beta1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nextcloud-mail",
-      "version": "3.5.0-alpha2",
+      "version": "3.5.0-beta1",
       "license": "agpl",
       "dependencies": {
         "@ckeditor/ckeditor5-alignment": "37.1.0",
diff --git a/package.json b/package.json
index 2ebc7d8f63..84b0fcd286 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nextcloud-mail",
   "description": "Nextcloud Mail",
-  "version": "3.5.0-alpha2",
+  "version": "3.5.0-beta1",
   "author": "Christoph Wurst <christoph@winzerhof-wurst.at>",
   "license": "agpl",
   "private": true,