diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index ab379c23..47618699 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -67,6 +67,7 @@ const PostStatusForm = {
         status: statusText,
         nsfw: false,
         files: [],
+        imageDescriptions: {},
         visibility: scope
       },
       caret: 0
@@ -242,6 +243,7 @@ const PostStatusForm = {
         visibility: newStatus.visibility,
         sensitive: newStatus.nsfw,
         media: newStatus.files,
+        imageDescriptions: newStatus.imageDescriptions || {},
         store: this.$store,
         inReplyToStatusId: this.replyTo,
         contentType: newStatus.contentType
@@ -251,6 +253,7 @@ const PostStatusForm = {
             status: '',
             spoilerText: '',
             files: [],
+            imageDescriptions: {},
             visibility: newStatus.visibility,
             contentType: newStatus.contentType
           }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 6ed5d92e..8d28289e 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -86,6 +86,7 @@
             <audio v-if="type(file) === 'audio'" :src="file.image" controls></audio>
             <a v-if="type(file) === 'unknown'" :href="file.image">{{file.url}}</a>
           </div>
+          <input type="text" :placeholder="$t('post_status.media_description')" v-model="newStatus.imageDescriptions[file.id]"></input>
         </div>
       </div>
       <div class="upload_settings" v-if="newStatus.files.length > 0">
@@ -158,6 +159,11 @@
       border-bottom-left-radius: 0;
       border-bottom-right-radius: 0;
     }
+
+    input {
+      min-width: 300px;
+      flex: 1;
+    }
   }
 
   .attachments {
diff --git a/src/i18n/en.json b/src/i18n/en.json
index c664fbfa..bc2ace12 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -60,6 +60,7 @@
     "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
     "account_not_locked_warning_link": "locked",
     "attachments_sensitive": "Mark attachments as sensitive",
+    "media_description": "Media description",
     "content_type": {
       "plain_text": "Plain text"
     },