diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md
index 0c56d2e41b..9e48bd82c5 100644
--- a/help/include/sidebar_index.md
+++ b/help/include/sidebar_index.md
@@ -85,7 +85,7 @@
 * [Preview messages before sending](/help/preview-your-message-before-sending)
 * [Verify a message was sent](/help/verify-your-message-was-successfully-sent)
 * [Edit or delete a message](/help/edit-or-delete-a-message)
-* [Message drafts](/help/view-and-edit-your-message-drafts)
+* [Draft messages](/help/view-and-edit-your-message-drafts)
 * [Schedule a message](/help/schedule-a-message)
 * [Message a stream by email](/help/message-a-stream-by-email)
 
diff --git a/help/view-and-edit-your-message-drafts.md b/help/view-and-edit-your-message-drafts.md
index 56a33ce48e..18395fdca3 100644
--- a/help/view-and-edit-your-message-drafts.md
+++ b/help/view-and-edit-your-message-drafts.md
@@ -1,7 +1,8 @@
-# View and edit your message drafts
+# Draft messages
 
-When you close the compose box, Zulip stores the content in a draft,
-so that you never lose your work. Drafts are saved for 30 days.
+Zulip automatically saves the content of your message as a draft when you
+close the compose box, ensuring that you never lose your work. Drafts are
+saved for 30 days.
 
 !!! warn ""
 
@@ -14,9 +15,57 @@ so that you never lose your work. Drafts are saved for 30 days.
 
 {tab|desktop-web}
 
-1. Simply close the compose box. You can hit <kbd>Esc</kbd>, click
-the <i class="fa fa-remove"></i> in the top right corner of the
-compose box, or click on an empty part of the app.
+{!start-composing.md!}
+
+1. Type at least 3 characters of text into the compose box.
+
+1. Close the compose box. For example, you can click the
+   <i class="fa fa-remove"></i> icon in the top right corner of the compose
+   box, or click on an empty area of the app to close the compose box and save
+   your message as a draft.
+
+!!! keyboard_tip ""
+
+    You can also use <kbd>Esc</kbd> to close the compose box and save your
+    message as a draft.
+
+{end_tabs}
+
+## Edit a draft
+
+{start_tabs}
+
+{tab|desktop-web}
+
+{relative|message|drafts}
+
+1. Click the **pencil** (<i class="fa fa-pencil"></i>) icon on the draft you
+   want to edit.
+
+1. Edit the message.
+
+!!! keyboard_tip ""
+
+    You can also use <kbd>Enter</kbd> within the drafts view to restore the
+    selected draft.
+
+{end_tabs}
+
+## Delete a draft
+
+{start_tabs}
+
+{tab|desktop-web}
+
+{relative|message|drafts}
+
+1. Click the **trash** (<i class="fa fa-trash-o"></i>) icon on the draft you
+   want to delete.
+
+!!! keyboard_tip ""
+
+    You can also use <kbd>Backspace</kbd> within the drafts view to delete the
+    selected draft.
 
 {end_tabs}
 
@@ -26,12 +75,17 @@ compose box, or click on an empty part of the app.
 
 {tab|desktop-web}
 
-1. Click on <i class="fa fa-pencil"></i> **Drafts** in the left sidebar.
-From there, you can delete or restore any of your drafts.
-
-{end_tabs}
+{relative|message|drafts}
 
 !!! keyboard_tip ""
 
-    Use <kbd>D</kbd> to bring up your list of drafts. Check out other
-    keyboard shortcuts related to drafts [here](/help/keyboard-shortcuts#drafts)
+    Use <kbd>D</kbd> to bring up your list of saved drafts.
+
+{end_tabs}
+
+## Related articles
+
+* [Schedule a message](/help/schedule-a-message)
+* [Preview messages before sending](/help/preview-your-message-before-sending)
+* [Verify a message was sent](/help/verify-your-message-was-successfully-sent)
+* [Edit or delete a message](/help/edit-or-delete-a-message)