diff --git a/webapp/titanembeds/static/css/embedstyle.css b/webapp/titanembeds/static/css/embedstyle.css
index cdb8580..829d0e4 100644
--- a/webapp/titanembeds/static/css/embedstyle.css
+++ b/webapp/titanembeds/static/css/embedstyle.css
@@ -761,6 +761,10 @@ p.mentioned span.chatmessage {
   width: 100%;
 }
 
+.richembed .image img.materialboxed.active {
+  max-width: none;
+}
+
 #chatcontent img.attachment {
   width: 100%;
   max-width: 300px;
@@ -769,6 +773,11 @@ p.mentioned span.chatmessage {
   display: block;
 }
 
+#chatcontent img.attachment.materialboxed.active {
+  max-width: none;
+  max-height: none;
+}
+
 #emoji-picker {
   color: black;
   position: fixed;
diff --git a/webapp/titanembeds/static/js/embed.js b/webapp/titanembeds/static/js/embed.js
index 2ca342f..0f8c94f 100644
--- a/webapp/titanembeds/static/js/embed.js
+++ b/webapp/titanembeds/static/js/embed.js
@@ -905,7 +905,7 @@
                 attach = " ";
             }
             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\" src=\"" + message.attachments[i].url + "\">";
+                attach += "<img class=\"attachment materialboxed\" src=\"" + message.attachments[i].url + "\">";
             } else {
                 attach += message.attachments[i].url;
             }
@@ -1159,6 +1159,7 @@
             target: "_blank"
         });
         $('.tooltipped').tooltip();
+        $('.materialboxed').materialbox();
         process_message_users_cache();
         return last;
     }
diff --git a/webapp/titanembeds/templates/embed.html.j2 b/webapp/titanembeds/templates/embed.html.j2
index 2dbe83a..bb3363b 100644
--- a/webapp/titanembeds/templates/embed.html.j2
+++ b/webapp/titanembeds/templates/embed.html.j2
@@ -380,7 +380,7 @@
           </div>
           {{#image}}
           <div class="image">
-            <img src="{{image.proxy_url}}">
+            <img src="{{image.proxy_url}}" class="materialboxed">
           </div>
           {{/image}}
           {{#toRenderFooter}}