diff --git a/lib/twitter_api.rb b/lib/twitter_api.rb
index f14b22cdd0a..373c6838f1f 100644
--- a/lib/twitter_api.rb
+++ b/lib/twitter_api.rb
@@ -22,6 +22,10 @@ class TwitterApi
             if large = m['sizes']['large']
               result << "<img class='tweet-image' src='#{m['media_url_https']}' width='#{large['w']}' height='#{large['h']}'>"
             end
+          elsif m['type'] == 'video'
+            if large = m['sizes']['large']
+              result << "<iframe class='tweet-video' src='https://twitter.com/i/videos/#{tweet['id_str']}' width='#{large['w']}' height='#{large['h']}' frameborder='0'></iframe>"
+            end
           end
         end
         result << "</div>"