diff --git a/app/assets/stylesheets/base/typography.scss b/app/assets/stylesheets/base/typography.scss
index e45e00558..3d9866232 100644
--- a/app/assets/stylesheets/base/typography.scss
+++ b/app/assets/stylesheets/base/typography.scss
@@ -234,11 +234,12 @@ body {
     margin: var(--content-rythm) 0;
   }
 
-  img {
+  img,
+  video {
     height: auto;
     position: relative;
     display: block;
-    margin: auto;
+    margin: var(--content-rythm) auto;
     max-width: 100%;
     max-height: calc(50vh + 180px);
     border-radius: var(--radius);
diff --git a/app/sanitizers/rendered_markdown_scrubber.rb b/app/sanitizers/rendered_markdown_scrubber.rb
index 0f1173ee6..db663ceb4 100644
--- a/app/sanitizers/rendered_markdown_scrubber.rb
+++ b/app/sanitizers/rendered_markdown_scrubber.rb
@@ -10,7 +10,7 @@ class RenderedMarkdownScrubber < Rails::Html::PermitScrubber
 
     self.attributes = %w[
       alt class colspan data-conversation data-lang data-no-instant data-url em height href id loop
-      name ref rel rowspan size span src start strong title type value width
+      name ref rel rowspan size span src start strong title type value width controls
     ]
   end