diff --git a/lib/embed/tweet.js b/lib/embed/tweet.js
index 08baa6ce..fcf00633 100644
--- a/lib/embed/tweet.js
+++ b/lib/embed/tweet.js
@@ -108,6 +108,22 @@ class Tweet extends Observable(Embed) {
     const media = extended.media || []
     return media.map((m, idx) => {
       m.imageUrl = `${this.url}-images-${idx}`
+      if (m.type === 'video') {
+        m.targetUrl = m.expanded_url
+        if (navigator.userAgent.indexOf('Firefox') === -1) {
+          m.video = {
+            imageUrl: m.imageUrl,
+            videoUrls: m.video_info.variants.map((m, idx) => {
+              return {
+                url: m.url,
+                contentType: m.content_type
+              }
+            })
+          }
+        }
+      } else {
+        m.targetUrl = m.imageUrl
+      }
       return m
     })
   }
@@ -159,7 +175,16 @@ class Tweet extends Observable(Embed) {
         {{#hasMedia}}
           <section class="media-{{media.length}}" id="media">
             {{#media}}
-              <a target="_blank" href="{{imageUrl}}"><img src="{{imageUrl}}"></a>
+              {{#video}}
+                <video poster="{{imageUrl}}" controls preload="none">
+                  {{#videoUrls}}
+                    <source src="{{url}}" type="{{contentType}}"></source>
+                  {{/videoUrls}}
+                </video>
+              {{/video}}
+              {{^video}}
+                <a target="_blank" href="{{targetUrl}}"><img src="{{imageUrl}}"></a>
+              {{/video}}
             {{/media}}
           </section>
         {{/hasMedia}}
diff --git a/lib/embed/tweet.scss b/lib/embed/tweet.scss
index 15478402..1d31516b 100644
--- a/lib/embed/tweet.scss
+++ b/lib/embed/tweet.scss
@@ -111,7 +111,7 @@ $quoteLineWidth: 4px;
       }
     }
 
-    img {
+    img, video {
       max-width: 100%;
       width: 100%;
       height: 100%;