2 files changed, 11 insertions, 3 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 25fa205d..7bf4fa2d 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -222,9 +222,9 @@ const Status = {
       if (this.attachmentSize === 'hide') {
         return []
       }
-      return this.$store.state.config.playVideosInline
-        ? ['image']
-        : ['image', 'video']
+      return this.$store.state.config.playVideosInModal
+        ? ['image', 'video']
+        : ['image']
     },
     galleryAttachments () {
       return this.status.attachments.filter(
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 5f3998a4..7581f749 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -285,6 +285,14 @@
         overflow: hidden;
         white-space: nowrap;
       }
+      & > span {
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+      }
+      & > a:last-child {
+        flex-shrink: 0;
+      }
     }
     .reply-info {
       display: flex;