diff --git a/help/format-a-quote.md b/help/format-a-quote.md
new file mode 100644
index 0000000000..70473bdc17
--- /dev/null
+++ b/help/format-a-quote.md
@@ -0,0 +1,12 @@
+# Format a quote
+
+{!quotes-intro.md!}
+
+## Examples
+
+{!quotes-examples.md!}
+
+## Related articles
+
+* [Message formatting](/help/format-your-message-using-markdown)
+* [Quote and reply](/help/quote-and-reply)
diff --git a/help/format-your-message-using-markdown.md b/help/format-your-message-using-markdown.md
index 4f3f278219..156929acec 100644
--- a/help/format-your-message-using-markdown.md
+++ b/help/format-your-message-using-markdown.md
@@ -65,20 +65,14 @@ whenever you need a reminder of the formatting syntax below.
 
 ## Quotes
 
-~~~
-> a multi-line
-quote on two lines
+{!quotes-intro.md!}
 
-normal text
+{!quotes-examples.md!}
 
-```quote
-A multi-paragraph
+!!! tip ""
 
-quote in two paragraphs
-```
-~~~
-
-![Markdown quotes](/static/images/help/markdown-quotes.png)
+    There is a handy option to [quote and reply](/help/quote-and-reply) to a
+    message in Zulip.
 
 ## Spoilers
 
diff --git a/help/include/quotes-examples.md b/help/include/quotes-examples.md
new file mode 100644
index 0000000000..2bfa166e48
--- /dev/null
+++ b/help/include/quotes-examples.md
@@ -0,0 +1,18 @@
+### What you type
+
+~~~
+> a multi-line
+quote on two lines
+
+normal text
+
+```quote
+A multi-paragraph
+
+quote in two paragraphs
+```
+~~~
+
+### What it looks like
+
+![Markdown quotes](/static/images/help/markdown-quotes.png)
diff --git a/help/include/quotes-intro.md b/help/include/quotes-intro.md
new file mode 100644
index 0000000000..41b6ce62ba
--- /dev/null
+++ b/help/include/quotes-intro.md
@@ -0,0 +1,2 @@
+You can format quotes one line at a time, or create a block of text that will be
+formatted as a quote.
diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md
index dc714b947c..f1e0c3493a 100644
--- a/help/include/sidebar_index.md
+++ b/help/include/sidebar_index.md
@@ -58,6 +58,7 @@
 ## Writing messages
 * [Message formatting](/help/format-your-message-using-markdown)
 * [Mention a user or group](/help/mention-a-user-or-group)
+* [Format a quote](/help/format-a-quote)
 * [Quote and reply](/help/quote-and-reply)
 * [Emoji and emoticons](/help/emoji-and-emoticons)
 * [Insert a link](/help/insert-a-link)
diff --git a/help/quote-and-reply.md b/help/quote-and-reply.md
index 03b5b390e3..0980c83312 100644
--- a/help/quote-and-reply.md
+++ b/help/quote-and-reply.md
@@ -10,7 +10,7 @@ to avoid unnecessarily mentioning someone twice.
 
 !!! tip ""
 
-    You can use [quote blocks](/help/format-your-message-using-markdown#quotes)
+    You can use [quote blocks](/help/format-a-quote)
     when quoting emails or other non-Zulip content.
 
 ## Quote and reply
@@ -54,7 +54,7 @@ to avoid unnecessarily mentioning someone twice.
 
 ## Related articles
 
-* [Format your message using markdown](/help/format-your-message-using-markdown)
+* [Format a quote](/help/format-a-quote)
 * [Link to a message or conversation][link-to-message]
 * [Mention a user or group](/help/mention-a-user-or-group)