diff --git a/FAQ.md b/FAQ.md
index 6280ee90ef..06fbbc98ab 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1877,6 +1877,8 @@ If you want to match a catch-all email address, this regex is usually fine, prov
 
 The username of a message being replied to will be used as the default username when editing of usernames is enabled in the advanced identity settings.
 
+Please see [this FAQ](#faq9) about editing the email address when composing a message.
+
 If you want to *not* match specific addresses, you can use something like this:
 
 ```
diff --git a/index.html b/index.html
index 97e631e15c..6d69ddcd14 100644
--- a/index.html
+++ b/index.html
@@ -1064,6 +1064,7 @@ X-Google-Original-From: Somebody &lt;somebody+extra@example.org&gt;</code></pre>
 <p>If you want to match a catch-all email address, this regex is usually fine, provided all usernames for the domain are yours:</p>
 <pre><code>.*</code></pre>
 <p>The username of a message being replied to will be used as the default username when editing of usernames is enabled in the advanced identity settings.</p>
+<p>Please see <a href="#faq9">this FAQ</a> about editing the email address when composing a message.</p>
 <p>If you want to <em>not</em> match specific addresses, you can use something like this:</p>
 <pre><code>^(?!marcel$|johanna$).*</code></pre>
 <p>If you like to match the special purpose email addresses abc@example.com and xyx@example.com and like to have a fallback email address main@example.com as well, you could do something like this:</p>