Merge branch 'develop' into luke/kill-mimage-fixupheight

src/components/views/messages/MImageBody.js

@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -210,6 +211,7 @@ export default class extends React.Component {
                 });
             }).done();
         }
+        this.fixupHeight();
         this._afterComponentDidMount();
     }