diff --git a/help/include/links-examples.md b/help/include/links-examples.md
index d21c56e327..25b97d0ec5 100644
--- a/help/include/links-examples.md
+++ b/help/include/links-examples.md
@@ -4,7 +4,8 @@
 Named link: [Zulip homepage](zulip.com)
 A URL (links automatically): zulip.com
 Channel link: #**channel name**
-Channel and topic link: #**channel name>topic name**
+Topic link: #**channel name>topic name**
+Message link: #**channel name>topic name@123**
 Custom linkifier: For example, #2468 can automatically link to an issue in your tracker.
 ```
 
diff --git a/help/include/links-intro.md b/help/include/links-intro.md
index d6398c90c8..2bb497b5d0 100644
--- a/help/include/links-intro.md
+++ b/help/include/links-intro.md
@@ -2,7 +2,6 @@ In Zulip, you can insert a named link using Markdown formatting. In addition, Zu
 automatically creates links for you when you enter:
 
 - A URL
-- An appropriately formatted channel name, or a channel name followed by a topic
-  (see also [Link to a message or
-  conversation](/help/link-to-a-message-or-conversation))
+- A reference to a channel, topic, or specific message (see also [Link to a
+  message or conversation](/help/link-to-a-message-or-conversation))
 - Text that matches a [custom linkifier](/help/add-a-custom-linkifier) set up by your organization
diff --git a/help/link-to-a-message-or-conversation.md b/help/link-to-a-message-or-conversation.md
index 86dafe762c..6957508681 100644
--- a/help/link-to-a-message-or-conversation.md
+++ b/help/link-to-a-message-or-conversation.md
@@ -50,13 +50,21 @@ This copies to your clipboard a permanent link to the message,
 displayed in its thread (i.e. topic view for messages in a channel).
 Viewing a topic via a message link will never mark messages as read.
 
-These links will still work even when the message is
-[moved to another topic](/help/move-content-to-another-topic)
-or [channel](/help/move-content-to-another-channel) or
-if its [topic is resolved](/help/resolve-a-topic).
+These links will still work even when the message is [moved to another
+topic](/help/move-content-to-another-topic) or
+[channel](/help/move-content-to-another-channel), or if its [topic is
+resolved](/help/resolve-a-topic). Zulip uses the same permanent link syntax when
+[quoting a message](/help/quote-and-reply).
 
-Zulip uses the same permanent link syntax when [quoting a
-message](/help/quote-and-reply).
+When you paste a message link into the compose box, it gets automatically
+formatted to be easy to read:
+
+```
+#**channel name>topic name@message ID**
+```
+
+When you send your message, the link will appear as **#channel name>topic
+name@💬**.
 
 {start_tabs}
 
@@ -71,6 +79,12 @@ message](/help/quote-and-reply).
     If using Zulip in a browser, you can also click on the timestamp
     of a message, and copy the URL from your browser's address bar.
 
+!!! tip ""
+
+    When you paste a message link into Zulip, it is automatically
+    formatted for you. You can paste as plain text if you prefer with
+    <kbd data-mac-following-key="⌥">Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>V</kbd>.
+
 {end_tabs}
 
 ### Get a link to a specific topic