diff --git a/src/skins/vector/css/common.css b/src/skins/vector/css/common.css
index 1b2aa410e..879561f91 100644
--- a/src/skins/vector/css/common.css
+++ b/src/skins/vector/css/common.css
@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 html {
+    /* hack to stop overscroll bounce on OSX and iOS.
+       N.B. Breaks things when we have legitimate horizontal overscroll */
     height: 100%;
     overflow: hidden;
 }
diff --git a/src/skins/vector/css/pages/MatrixChat.css b/src/skins/vector/css/pages/MatrixChat.css
index 58f280fd9..6fa0415af 100644
--- a/src/skins/vector/css/pages/MatrixChat.css
+++ b/src/skins/vector/css/pages/MatrixChat.css
@@ -88,7 +88,9 @@ limitations under the License.
     padding-left: 12px;
     padding-right: 12px;
     background-color: #f3f8fa;
-    width: 100%;
+
+    -webkit-flex: 1;
+    flex: 1;
 
     /* XXX: Hack: apparently if you try to nest a flex-box
      * within a non-flex-box within a flex-box, the height