diff --git a/FAQ.md b/FAQ.md
index fddafc89ed..d645ed6069 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -4025,6 +4025,12 @@ The subject of a received message can be edited, also on the email server, via t
 
 <br />
 
+*Markdown (1.2061+)*
+
+Composing messages using [Markdown](https://en.wikipedia.org/wiki/Markdown) can be enabled via the three-dots overflow menu of the message editor.
+
+<br />
+
 <a name="faq126"></a>
 **(126) Can message previews be sent to my smartwatch?**
 
diff --git a/index.html b/index.html
index 06ab276295..798d2f65e4 100644
--- a/index.html
+++ b/index.html
@@ -2057,6 +2057,9 @@ $NotDisplayed</code></pre>
 <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><em>Markdown (1.2061+)</em></p>
+<p>Composing messages using <a href="https://en.wikipedia.org/wiki/Markdown">Markdown</a> can be enabled via the three-dots overflow menu of the message editor.</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>