diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md
index c7559725fc..30203ffc24 100644
--- a/templates/zerver/help/include/sidebar_index.md
+++ b/templates/zerver/help/include/sidebar_index.md
@@ -28,7 +28,7 @@
 * [Message drafts](/help/view-and-edit-your-message-drafts)
 * [Emoji and emoticons](/help/emoji-and-emoticons)
 * [Video calls](/help/start-a-call)
-* [Share and upload files](/help/upload-and-share-files)
+* [Share and upload files](/help/share-and-upload-files)
 * [Manage your uploaded files](/help/manage-your-uploaded-files)
 <!-- Automatically link to an external issue tracker (improve wording) -->
 * [Enable pressing Enter to send](/help/enable-or-disable-pressing-enter-to-send)
diff --git a/templates/zerver/help/share-and-upload-files.md b/templates/zerver/help/share-and-upload-files.md
new file mode 100644
index 0000000000..0e01c5534e
--- /dev/null
+++ b/templates/zerver/help/share-and-upload-files.md
@@ -0,0 +1,31 @@
+# Share and upload files
+
+Attach files to messages, including images, documents, sound, and video.
+
+[Start composing](/help/compose-and-reply) a new message or reply. Then
+
+* **Drag and drop** files into the compose box.
+* **Copy and paste** files into the compose box.
+* **Click the paperclip** (<i class="icon-vector-paperclip"></i>) icon at
+  the bottom of the compose box to find files on your computer.
+
+Zulip will insert a link to the file, in Markdown format:
+`[link text](URL)`. You can modily the `link text` to whatever you want.
+
+Zulip will automatically generate a **thumbnail** of the file when you send
+it, if it can. You can
+[preview the message](/help/preview-your-message-before-sending) before
+sending to see what the thumbnail will look like.
+
+## Troubleshooting info
+
+Zulip does not generate thumbnails for messages with more than 5
+attachments.
+
+The maximum file size for attachments is 25MB in most Zulip installations.
+This limit can be changed by the server administrator.
+
+## Related articles
+
+* [Manage your uploaded files](/help/manage-your-uploaded-files)
+* [View an image at full size](/help/viewing-images)
diff --git a/templates/zerver/help/upload-and-share-files.md b/templates/zerver/help/upload-and-share-files.md
deleted file mode 100644
index 509d78aa48..0000000000
--- a/templates/zerver/help/upload-and-share-files.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Upload and share files
-
-Zulip allows you to easily attach files, including images, sound, and video by:
-
-- Clicking the paperclip (<i class="icon-vector-paperclip"></i>) icon located
-under the message field.
-- Dragging or dropping files into the compose box. The files are uploaded to a
-server and a link is supplied, but a thumbnail is displayed if possible. The
-link to the file will be in Markdown format: `[link_text](link_URL)`
-
-!!! tip ""
-    If you wish to give your image a caption or title, you may add text before
-    or after the generated link in your message.
-
-!!! tip ""
-    The maximum size for uploaded files is 25MB in most Zulip installations.
-    This limit can be changed by the server administrator.
-
-After submitting your message, you will see a clickable thumbnail if
-your file is a common image type (i.e. PNG, JPEG, etc.); all other
-files will simply have a link displayed.
-
-!!! tip ""
-    You can view and [manage your uploaded files](/help/manage-your-uploaded-files)
-    in the [Uploaded files](/#settings/uploaded-files) tab.
-
-## Link Behavior
-
-Clicking all file links will open a new tab that will either:
-
-- display the file if it is an image.
-- download the file automatically to your computer.
-
-If the file has a thumbnail, clicking it will open a lightbox modal with
-varying options depending on the media type. Images may be opened in new
-tabs or downloaded, while videos from YouTube may only be opened (and not
-downloaded).
-
-!!! tip ""
-    You can exit out of a lightbox by clicking the space around the media preview
-    or by clicking the x (<i class="icon-vector-remove"></i>) icon found in
-    the upper right-hand corner.
-
-## Sharing files from external websites
-
-Images and videos shared from external websites, such as Imgur or
-YouTube, may have previews generated as well. Clicking previews of
-images/videos from external websites will lead to the same lightbox
-behavior described above.