diff --git a/js/views/attachment_view.js b/js/views/attachment_view.js
index ce2f538797..f7f8afb7aa 100644
--- a/js/views/attachment_view.js
+++ b/js/views/attachment_view.js
@@ -22,11 +22,6 @@
           this.update();
         }, {
           orientation: true,
-          // From CSS:
-          // maxWidth: 30em --> 420px
-          // maxHeight: 300px
-          maxWidth: 420,
-          maxHeight: 300,
         });
       },
       events: {
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 6a0c6976b7..200e639860 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -568,7 +568,10 @@ span.status {
       background-color: #ccc;
     }
 
-    img, audio, video {
+    img,
+    canvas, /* used for auto-oriented images from `loadImage` */
+    audio,
+    video {
       max-width: 100%;
       max-height: 300px;
     }