diff --git a/media/css/reader.css b/media/css/reader.css
index 7b5f1ce7f..19bb6d9ad 100644
--- a/media/css/reader.css
+++ b/media/css/reader.css
@@ -2778,6 +2778,11 @@ body {
   
   /* See http://www.newsblur.com/site/1031643/le-21me for width: auto, height: auto */
 }
+
+.NB-feed-story .NB-feed-story-content video {
+    max-width: 100%;
+}
+
 .NB-feed-story {
     position: relative;
 }
diff --git a/utils/twitter_fetcher.py b/utils/twitter_fetcher.py
index 6137f66c2..5e0d5785b 100644
--- a/utils/twitter_fetcher.py
+++ b/utils/twitter_fetcher.py
@@ -225,9 +225,8 @@ class TwitterFetcher:
                     tweet_text = tweet_text.replace(media['url'], replacement)
                     replaced[media['url']] = True
                 entities += "<img src=\"%s\"> <hr>" % media['media_url_https']
-                if 'photo' not in categories:
-                    categories.add('photo')
-            if media['type'] == 'video':
+                categories.add('photo')
+            if media['type'] == 'video' or media['type'] == 'animated_gif':
                 if media.get('url') and media['url'] in tweet_text:
                     tweet_title = tweet_title.replace(media['url'], media['display_url'])
                 replacement = "<a href=\"%s\">%s</a>" % (media['expanded_url'], media['display_url'])
@@ -244,10 +243,8 @@ class TwitterFetcher:
                         chosen_variant = variant
                 if chosen_variant:
                     entities += "<video src=\"%s\" autoplay loop muted playsinline> <hr>" % chosen_variant['url']
-                if 'video' not in categories:
-                    categories.add('video')
+                categories.add(media['type'])                
                 
-
         for url in content_tweet['entities'].get('urls', []):
             if url['url'] in tweet_text:
                 replacement = "<a href=\"%s\">%s</a>" % (url['expanded_url'], url['display_url'])