Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to

res/css/views/messages/_MImageBody.scss

@@ -15,6 +15,10 @@ limitations under the License.
 */
 
 .mx_MImageBody {
-  display: block;
-  margin-right: 34px;
+    display: block;
+    margin-right: 34px;
 }
+
+.mx_MImageBody_thumbnail {
+    max-width: 100%;
+}

res/css/views/rooms/_EventTile.scss

@@ -294,6 +294,16 @@ limitations under the License.
     cursor: pointer;
 }
 
+.mx_EventTile_e2eIcon_hidden {
+    display: none;
+}
+
+/* always override hidden attribute for blocked and warning */
+.mx_EventTile_e2eIcon_hidden[src="img/e2e-blocked.svg"],
+.mx_EventTile_e2eIcon_hidden[src="img/e2e-warning.svg"] {
+    display: block;
+}
+
 .mx_EventTile_keyRequestInfo {
     font-size: 12px;
 }