diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index f6965c493..8c65b92e0 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -17,7 +17,8 @@
     }
   }
 
-  .image {
+  .image,
+  .video {
     cursor: pointer;
     position: relative;
 
@@ -29,17 +30,32 @@
       max-width: 85%;
     }
 
+    .modal-video {
+      max-height: 75vh;
+      max-width: 100%;
+    }
+
     &::before {
       background-image: linear-gradient(-180deg, transparent 3%, $color-heading 130%);
       bottom: 0;
       content: '';
       height: 20%;
       left: 0;
-      opacity: .8;
+      opacity: 0.8;
       position: absolute;
       width: 100%;
     }
   }
+
+  .video {
+    .modal-container {
+      width: auto;
+
+      .modal--close {
+        z-index: var(--z-index-low);
+      }
+    }
+  }
 }
 
 .conversations-list-wrap {
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index b3674681a..bd832f4ba 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -31,6 +31,11 @@
             <audio v-else-if="attachment.file_type === 'audio'" controls>
               <source :src="attachment.data_url" />
             </audio>
+            <bubble-video
+              v-else-if="attachment.file_type === 'video'"
+              :url="attachment.data_url"
+              :readable-time="readableTime"
+            />
             <bubble-file
               v-else
               :url="attachment.data_url"
@@ -91,6 +96,7 @@ import BubbleMailHead from './bubble/MailHead';
 import BubbleText from './bubble/Text';
 import BubbleImage from './bubble/Image';
 import BubbleFile from './bubble/File';
+import BubbleVideo from './bubble/Video.vue';
 import BubbleActions from './bubble/Actions';
 
 import Spinner from 'shared/components/Spinner';
@@ -108,6 +114,7 @@ export default {
     BubbleText,
     BubbleImage,
     BubbleFile,
+    BubbleVideo,
     BubbleMailHead,
     ContextMenu,
     Spinner,
@@ -236,14 +243,6 @@ export default {
     isMessageDeleted() {
       return this.contentAttributes.deleted;
     },
-    hasImageAttachment() {
-      if (this.hasAttachments && this.data.attachments.length > 0) {
-        const { attachments = [{}] } = this.data;
-        const { file_type: fileType } = attachments[0];
-        return fileType === 'image';
-      }
-      return false;
-    },
     hasText() {
       return !!this.data.content;
     },
@@ -270,7 +269,8 @@ export default {
       return {
         bubble: this.isBubble,
         'is-private': this.data.private,
-        'is-image': this.hasImageAttachment,
+        'is-image': this.hasMediaAttachment('image'),
+        'is-video': this.hasMediaAttachment('video'),
         'is-text': this.hasText,
         'is-from-bot': this.isSentByBot,
       };
@@ -288,6 +288,14 @@ export default {
     },
   },
   methods: {
+    hasMediaAttachment(type) {
+      if (this.hasAttachments && this.data.attachments.length > 0) {
+        const { attachments = [{}] } = this.data;
+        const { file_type: fileType } = attachments[0];
+        return fileType === type;
+      }
+      return false;
+    },
     handleContextMenuClick() {
       this.showContextMenu = !this.showContextMenu;
     },
@@ -315,17 +323,28 @@ export default {
 <style lang="scss">
 .wrap {
   > .bubble {
-    &.is-image {
+    &.is-image,
+    &.is-video {
       padding: 0;
       overflow: hidden;
 
-      .image {
+      .image,
+      .video {
         max-width: 32rem;
         padding: var(--space-micro);
 
-        > img {
+        > img,
+        > video {
           border-radius: var(--border-radius-medium);
         }
+        > video {
+          height: 100%;
+          object-fit: cover;
+          width: 100%;
+        }
+      }
+      .video {
+        height: 18rem;
       }
     }
 
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index aa286d6f5..0413ab8a9 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -181,7 +181,8 @@ export default {
   }
 }
 
-.is-image {
+.is-image,
+.is-video {
   .message-text--metadata {
     .time {
       bottom: var(--space-smaller);
@@ -206,7 +207,8 @@ export default {
     }
   }
 
-  &.is-image {
+  &.is-image,
+  &.is-video {
     .time {
       position: inherit;
       padding-left: var(--space-one);
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Video.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Video.vue
new file mode 100644
index 000000000..14c26733b
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Video.vue
@@ -0,0 +1,32 @@
+<template>
+  <div class="video message-text__wrap">
+    <video :src="url" muted playsInline @click="onClick" />
+    <woot-modal :show.sync="show" :on-close="onClose">
+      <video :src="url" controls playsInline class="modal-video" />
+    </woot-modal>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    url: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      show: false,
+    };
+  },
+  methods: {
+    onClose() {
+      this.show = false;
+    },
+    onClick() {
+      this.show = true;
+    },
+  },
+};
+</script>