diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 10941e0f7f7..aadd3294632 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -106,7 +106,16 @@ module.exports = React.createClass({
             }
             return this.state.decryptedUrl;
         } else {
-            return MatrixClientPeg.get().mxcUrlToHttp(content.url, 800, 600);
+            if (content.info) {
+                const cappedWidth = Math.min(800, content.info.w);
+                return MatrixClientPeg.get().mxcUrlToHttp(
+                    content.url,
+                    cappedWidth,
+                    Math.floor(content.info.h * (cappedWidth / content.info.w)),
+                );
+            } else {
+                return MatrixClientPeg.get().mxcUrlToHttp(content.url, 800, 600);
+            }
         }
     },