diff --git a/webapp/titanembeds/static/css/embed.css b/webapp/titanembeds/static/css/embed.css
index 3aa15b6..7531143 100644
--- a/webapp/titanembeds/static/css/embed.css
+++ b/webapp/titanembeds/static/css/embed.css
@@ -782,6 +782,11 @@ p.mentioned span.chatmessage {
   max-width: none;
 }
 
+.richembed .video {
+  width: 100%;
+  max-width: 450px;
+}
+
 #chatcontent img.attachment {
   width: 100%;
   max-width: 300px;
@@ -795,6 +800,11 @@ p.mentioned span.chatmessage {
   max-height: none;
 }
 
+#chatcontent .player {
+  width: 100%;
+  max-width: 400px;
+}
+
 .wdt-emoji-popup {
   position: fixed;
   bottom: 5%;
diff --git a/webapp/titanembeds/static/js/embed.js b/webapp/titanembeds/static/js/embed.js
index bc26356..80b6e97 100644
--- a/webapp/titanembeds/static/js/embed.js
+++ b/webapp/titanembeds/static/js/embed.js
@@ -962,6 +962,8 @@
             }
             if (message.attachments[i].url.endsWith(".png") || message.attachments[i].url.endsWith(".jpg") || message.attachments[i].url.endsWith(".jpeg") || message.attachments[i].url.endsWith(".gif")) {
                 attach += "<img class=\"attachment materialboxed\" src=\"" + message.attachments[i].url + "\">";
+            } else if (message.attachments[i].url.endsWith(".mp4")) {
+                attach += "<video class=\"player\" src=\"" + message.attachments[i].url + "\" frameborder=\"0\" allow=\"encrypted-media\" allowfullscreen controls preload poster=\"" + message.attachments[i].proxy_url + "?format=png\"></video>";
             } else {
                 attach += message.attachments[i].url;
             }
diff --git a/webapp/titanembeds/templates/embed.html.j2 b/webapp/titanembeds/templates/embed.html.j2
index 9b56846..1635662 100644
--- a/webapp/titanembeds/templates/embed.html.j2
+++ b/webapp/titanembeds/templates/embed.html.j2
@@ -415,7 +415,14 @@
               {{/description}}
               {{/isVideo}}
               {{#isVideo}}
-              <iframe class="video" src="{{video.url}}" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+              <div class="video">
+                {{#video.proxy_url}}
+                <video class="player" src="{{video.url}}" frameborder="0" allow="encrypted-media" allowfullscreen controls preload poster="{{thumbnail.proxy_url}}"></video>
+                {{/video.proxy_url}}
+                {{^video.proxy_url}}
+                <iframe class="player" src="{{video.url}}" frameborder="0" allow="encrypted-media" allowfullscreen></iframe>
+                {{/video.proxy_url}}
+              </div>
               {{/isVideo}}
               {{#fields.length}}
               <div class="fields">