diff --git a/package.json b/package.json
index c52e26d0a0..2b407a892c 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "babel-polyfill": "^6.5.0",
     "browser-request": "^0.3.3",
     "classnames": "^2.1.2",
-    "draft-js": "^0.7.0",
+    "draft-js": "^0.8.1",
     "extract-text-webpack-plugin": "^0.9.1",
     "filesize": "^3.1.2",
     "flux": "~2.0.3",
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css
index 6c76dc00d7..842f8db655 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css
@@ -60,6 +60,12 @@ limitations under the License.
     color: #888;
 }
 
+.mx_MessageComposer_input_wrapper {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+}
+
 .mx_MessageComposer_input {
     flex: 1;
     vertical-align: middle;