diff --git a/package-lock.json b/package-lock.json
index 048fba30e4..3dedf8dcd2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.7",
+  "version": "0.12.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1708,6 +1708,11 @@
       "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
       "dev": true
     },
+    "direction": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/direction/-/direction-0.1.5.tgz",
+      "integrity": "sha1-zl15f5fib4vnvv9T99xA4cGp7Ew="
+    },
     "doctrine": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
@@ -1774,37 +1779,6 @@
         "domelementtype": "1.3.0"
       }
     },
-    "draft-js": {
-      "version": "0.11.0-alpha",
-      "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.11.0-alpha.tgz",
-      "integrity": "sha1-MtshCPkn6bhEbaH3nkR1wrf4aK4=",
-      "requires": {
-        "fbjs": "0.8.16",
-        "immutable": "3.7.6",
-        "object-assign": "4.1.1"
-      }
-    },
-    "draft-js-export-html": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/draft-js-export-html/-/draft-js-export-html-0.6.0.tgz",
-      "integrity": "sha1-zIDwVExD0Kf+28U8DLCRToCQ92k=",
-      "requires": {
-        "draft-js-utils": "1.2.0"
-      }
-    },
-    "draft-js-export-markdown": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/draft-js-export-markdown/-/draft-js-export-markdown-0.3.0.tgz",
-      "integrity": "sha1-hjkOA86vHTR/xhaGerf1Net2v0I=",
-      "requires": {
-        "draft-js-utils": "1.2.0"
-      }
-    },
-    "draft-js-utils": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.2.0.tgz",
-      "integrity": "sha1-9csj6xZzJf/tPXmIL9wxdyHS/RI="
-    },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -2237,6 +2211,11 @@
         "object-assign": "4.1.1"
       }
     },
+    "esrever": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/esrever/-/esrever-0.2.0.tgz",
+      "integrity": "sha1-lunSj08bGnZ4TNXUkOquAQ50B7g="
+    },
     "estraverse": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
@@ -3574,6 +3553,19 @@
         "is-property": "1.0.2"
       }
     },
+    "get-document": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-document/-/get-document-1.0.0.tgz",
+      "integrity": "sha1-SCG85m8cJMsDMWAr5strEsTwHEs="
+    },
+    "get-window": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/get-window/-/get-window-1.1.2.tgz",
+      "integrity": "sha512-yjWpFcy9fjhLQHW1dPtg9ga4pmizLY8y4ZSHdGrAQ1NU277MRhnGnnLPxe19X8W5lWVsCZz++5xEuNozWMVmTw==",
+      "requires": {
+        "get-document": "1.0.0"
+      }
+    },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -3928,6 +3920,11 @@
       "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
       "dev": true
     },
+    "is-empty": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-empty/-/is-empty-1.2.0.tgz",
+      "integrity": "sha1-3pu1snhzigWgsJpX4ftNSjQan2s="
+    },
     "is-equal": {
       "version": "1.5.5",
       "resolved": "https://registry.npmjs.org/is-equal/-/is-equal-1.5.5.tgz",
@@ -4001,6 +3998,16 @@
         "is-extglob": "1.0.0"
       }
     },
+    "is-hotkey": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/is-hotkey/-/is-hotkey-0.1.2.tgz",
+      "integrity": "sha512-H05t1Tc+uCWLOjHtF1bZH3b/i7+RkjlhwFWDsroTwC0acCjXOVyjJ63yTnRGdNhV5bnKIcYnijgLAJtM0/Xqsw=="
+    },
+    "is-in-browser": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz",
+      "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU="
+    },
     "is-my-json-valid": {
       "version": "2.16.1",
       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
@@ -4052,6 +4059,21 @@
         "path-is-inside": "1.0.2"
       }
     },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "requires": {
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        }
+      }
+    },
     "is-posix-bracket": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
@@ -4110,6 +4132,11 @@
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
+    "is-window": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-window/-/is-window-1.0.2.tgz",
+      "integrity": "sha1-LIlspT25feRdPDMTOmXYyfVjSA0="
+    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -4136,6 +4163,11 @@
         "isarray": "1.0.0"
       }
     },
+    "isomorphic-base64": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/isomorphic-base64/-/isomorphic-base64-1.0.2.tgz",
+      "integrity": "sha1-9Caq6CVpuopOxcpzrSGkSrHueAM="
+    },
     "isomorphic-fetch": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
@@ -4417,6 +4449,11 @@
         }
       }
     },
+    "keycode": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz",
+      "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ="
+    },
     "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -4561,9 +4598,9 @@
       }
     },
     "lolex": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz",
-      "integrity": "sha512-uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg=="
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
+      "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng=="
     },
     "longest": {
       "version": "1.0.1",
@@ -4586,9 +4623,9 @@
       "dev": true
     },
     "matrix-js-sdk": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.4.tgz",
-      "integrity": "sha512-jmO08eml0mr+us2Xs9F9UD2U6gX/MVD20QEqrEt3p+cuZ043OEWCg6Ko8mR65P/JteqjXMz+TXOMmfcxLwCLFA==",
+      "version": "0.10.6",
+      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.6.tgz",
+      "integrity": "sha512-8aC6wpHBCBgnJ/v0FjfBkjNo2BR3LlU5hIM2ql5OqxTbY64miJ5WKr8hD4meD86C/TSHtzJtlLrlThO0vmHuwg==",
       "requires": {
         "another-json": "0.2.0",
         "babel-runtime": "6.26.0",
@@ -4788,8 +4825,7 @@
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "mute-stream": {
       "version": "0.0.5",
@@ -5437,6 +5473,11 @@
         "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
       }
     },
+    "react-immutable-proptypes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz",
+      "integrity": "sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ="
+    },
     "react-motion": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz",
@@ -5454,6 +5495,14 @@
         }
       }
     },
+    "react-portal": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/react-portal/-/react-portal-3.2.0.tgz",
+      "integrity": "sha512-avb1FreAZAVCvNNyS2dCpxZiPYPJnAasHYPxdVBTROgNFeI+KSb+OoMHNsC1GbDawESCriPwCX+qKua6WSPIFw==",
+      "requires": {
+        "prop-types": "15.6.0"
+      }
+    },
     "react-redux": {
       "version": "5.0.7",
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz",
@@ -5687,6 +5736,11 @@
       "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
       "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc="
     },
+    "resize-observer-polyfill": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz",
+      "integrity": "sha512-M2AelyJDVR/oLnToJLtuDJRBBWUGUvvGigj1411hXhAdyFWqMaqHp7TixW3FpiLuVaikIcR1QL+zqoJoZlOgpg=="
+    },
     "resolve": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
@@ -5793,6 +5847,11 @@
         "xtend": "4.0.1"
       }
     },
+    "selection-is-backward": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/selection-is-backward/-/selection-is-backward-1.0.0.tgz",
+      "integrity": "sha1-l6VGMxiKURq6ZBn8XB+pG0Z+a+E="
+    },
     "semver": {
       "version": "4.3.6",
       "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
@@ -5893,6 +5952,127 @@
       "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
       "dev": true
     },
+    "slate": {
+      "version": "0.34.7",
+      "resolved": "https://registry.npmjs.org/slate/-/slate-0.34.7.tgz",
+      "integrity": "sha1-WQjh0PwJKiISSIvsplZx8B4OuAo=",
+      "requires": {
+        "debug": "3.1.0",
+        "direction": "0.1.5",
+        "esrever": "0.2.0",
+        "is-empty": "1.2.0",
+        "is-plain-object": "2.0.4",
+        "lodash": "4.17.4",
+        "slate-dev-logger": "0.1.39",
+        "slate-schema-violations": "0.1.20",
+        "type-of": "2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "slate-base64-serializer": {
+      "version": "0.2.41",
+      "resolved": "https://registry.npmjs.org/slate-base64-serializer/-/slate-base64-serializer-0.2.41.tgz",
+      "integrity": "sha1-z+yhA7X9rd2WeOACWADfw174QJg=",
+      "requires": {
+        "isomorphic-base64": "1.0.2"
+      }
+    },
+    "slate-dev-environment": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/slate-dev-environment/-/slate-dev-environment-0.1.2.tgz",
+      "integrity": "sha1-dDqL1/Qn3CckJbBDminoPKVSFog=",
+      "requires": {
+        "is-in-browser": "1.1.3"
+      }
+    },
+    "slate-dev-logger": {
+      "version": "0.1.39",
+      "resolved": "https://registry.npmjs.org/slate-dev-logger/-/slate-dev-logger-0.1.39.tgz",
+      "integrity": "sha1-dEppuFA0JEcT5t5RSDr1cTw0WvQ="
+    },
+    "slate-hotkeys": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/slate-hotkeys/-/slate-hotkeys-0.1.2.tgz",
+      "integrity": "sha1-LjWgikLqqhE7ZNQ41TfnelgsjUo=",
+      "requires": {
+        "is-hotkey": "0.1.2",
+        "slate-dev-environment": "0.1.2"
+      }
+    },
+    "slate-html-serializer": {
+      "version": "0.6.13",
+      "resolved": "https://registry.npmjs.org/slate-html-serializer/-/slate-html-serializer-0.6.13.tgz",
+      "integrity": "sha1-7kzECd/w+Bk/OddemXKJTrmsydo=",
+      "requires": {
+        "slate-dev-logger": "0.1.39",
+        "type-of": "2.0.1"
+      }
+    },
+    "slate-md-serializer": {
+      "version": "github:matrix-org/slate-md-serializer#f7c4ad394f5af34d4c623de7909ce95ab78072d3"
+    },
+    "slate-plain-serializer": {
+      "version": "0.5.22",
+      "resolved": "https://registry.npmjs.org/slate-plain-serializer/-/slate-plain-serializer-0.5.22.tgz",
+      "integrity": "sha1-kcgbdDi02M03Rqu8oA5XTlFL6bw=",
+      "requires": {
+        "slate-dev-logger": "0.1.39"
+      }
+    },
+    "slate-prop-types": {
+      "version": "0.4.39",
+      "resolved": "https://registry.npmjs.org/slate-prop-types/-/slate-prop-types-0.4.39.tgz",
+      "integrity": "sha1-+taDqyVzIa1LP4NvrkDopfWc0Jo=",
+      "requires": {
+        "slate-dev-logger": "0.1.39"
+      }
+    },
+    "slate-react": {
+      "version": "0.12.11",
+      "resolved": "https://registry.npmjs.org/slate-react/-/slate-react-0.12.11.tgz",
+      "integrity": "sha1-bYPmBGNHBHV2kKV9vWqrKCqWStM=",
+      "requires": {
+        "debug": "3.1.0",
+        "get-window": "1.1.2",
+        "is-window": "1.0.2",
+        "keycode": "2.2.0",
+        "lodash": "4.17.4",
+        "prop-types": "15.6.0",
+        "react-immutable-proptypes": "2.1.0",
+        "react-portal": "3.2.0",
+        "selection-is-backward": "1.0.0",
+        "slate-base64-serializer": "0.2.41",
+        "slate-dev-environment": "0.1.2",
+        "slate-dev-logger": "0.1.39",
+        "slate-hotkeys": "0.1.2",
+        "slate-plain-serializer": "0.5.22",
+        "slate-prop-types": "0.4.39"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "slate-schema-violations": {
+      "version": "0.1.20",
+      "resolved": "https://registry.npmjs.org/slate-schema-violations/-/slate-schema-violations-0.1.20.tgz",
+      "integrity": "sha1-v2O0+ylbkPQhiTlWStr80cLyF1k="
+    },
     "slice-ansi": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
@@ -6400,6 +6580,11 @@
         "mime-types": "2.1.17"
       }
     },
+    "type-of": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/type-of/-/type-of-2.0.1.tgz",
+      "integrity": "sha1-5yoXQYllaOn2KDeNgW1pEvfyOXI="
+    },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",