diff --git a/app/src/main/assets/CHANGELOG.md b/app/src/main/assets/CHANGELOG.md
index ead6250836..e684cce4ee 100644
--- a/app/src/main/assets/CHANGELOG.md
+++ b/app/src/main/assets/CHANGELOG.md
@@ -30,6 +30,10 @@ For support you can use [the contact form](https://contact.faircode.eu/?product=
 
 ### Next version (Work in progress)
 
+* Fixed all reported issues
+* Added drag and drop to address bubbles
+* Added *submitter*, *cc*, *bcc* and *replyto* to [expression conditions](https://m66b.github.io/FairEmail/#expression_conditions)
+
 ### 1.2333 2026-09-01
 
 * Added support for S/MIME [auth-enveloped-data](https://www.rfc-editor.org/info/rfc5083/)
diff --git a/app/src/main/java/eu/faircode/email/ExpressionHelper.java b/app/src/main/java/eu/faircode/email/ExpressionHelper.java
index aa4a02dca4..5467f266ea 100644
--- a/app/src/main/java/eu/faircode/email/ExpressionHelper.java
+++ b/app/src/main/java/eu/faircode/email/ExpressionHelper.java
@@ -63,7 +63,7 @@ import javax.mail.internet.InternetHeaders;
 
 public class ExpressionHelper {
     private static final List<String> EXPR_VARIABLES = Collections.unmodifiableList(Arrays.asList(
-            "received", "to", "from", "subject", "text", "hasAttachments"
+            "received", "return_path", "submitter", "from", "to", "cc", "bcc", "subject", "replyto", "text", "hasAttachments"
     ));
 
     static void check(Expression expression) throws ParseException {
diff --git a/metadata/en-US/changelogs/2333.txt b/metadata/en-US/changelogs/2333.txt
index 0748fe0b8f..39f4a264da 100644
--- a/metadata/en-US/changelogs/2333.txt
+++ b/metadata/en-US/changelogs/2333.txt
@@ -30,6 +30,10 @@ Elopteryx
 
 Next version (Work in progress)
 
+* Fixed all reported issues
+* Added drag and drop to address bubbles
+* Added *submitter*, *cc*, *bcc* and *replyto* to expression conditions
+
 1.2333 2026-09-01
 
 * Added support for S/MIME auth-enveloped-data