diff --git a/FAQ.md b/FAQ.md
index a6cf4d9cee..160f94155d 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -3984,6 +3984,12 @@ a toolbar to perform operations (align text, insert list, indent text, insert bl
 
 <br />
 
+*Edit subject (1.2046+)*
+
+The subject of a received message can be edited, also on the email server, via the horizontal three-dots button just above the message text near the left side of the screen.
+
+<br>
+
 <a name="faq126"></a>
 **(126) Can message previews be sent to my smartwatch?**
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 5d0237ae59..c315112b45 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -6111,6 +6111,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             boolean dark = Helper.isDarkTheme(context);
             boolean force_light = properties.getValue("force_light", message.id);
 
+            boolean experiments = prefs.getBoolean("experiments", false);
+
             PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, ibMore);
             popupMenu.inflate(R.menu.popup_message_more);
 
@@ -6138,7 +6140,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             popupMenu.getMenu().findItem(R.id.menu_edit_subject)
                     .setEnabled(message.uid != null && !message.folderReadOnly)
                     .setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP &&
-                            !BuildConfig.PLAY_STORE_RELEASE);
+                            experiments);
 
             popupMenu.getMenu().findItem(R.id.menu_move_to)
                     .setEnabled(message.uid != null && !message.folderReadOnly)
diff --git a/index.html b/index.html
index dc8b0424b7..671cbb4f63 100644
--- a/index.html
+++ b/index.html
@@ -2017,6 +2017,9 @@ $NotDisplayed</code></pre>
 <p><em>Block toolbar (version 1.1967+)</em></p>
 <p>When enabled in the three-dots overflow menu of the message editor, a toolbar to perform operations (align text, insert list, indent text, insert blockquote) on a block of text (consecutive non-empty lines) will be shown.</p>
 <p><br /></p>
+<p><em>Edit subject (1.2046+)</em></p>
+<p>The subject of a received message can be edited, also on the email server, via the horizontal three-dots button just above the message text near the left side of the screen.</p>
+<p><br></p>
 <p><a name="faq126"></a> <strong>(126) Can message previews be sent to my smartwatch?</strong></p>
 <p>🌎 <a href="https://translate.google.com/translate?sl=en&amp;u=https%3A%2F%2Fm66b.github.io%2FFairEmail%2F%23faq126">Google Translate</a></p>
 <p>FairEmail fetches a message in two steps:</p>