diff --git a/client/src/components/Draftail/__snapshots__/index.test.js.snap b/client/src/components/Draftail/__snapshots__/index.test.js.snap
index b2d6bda54e3a..8097db887684 100644
--- a/client/src/components/Draftail/__snapshots__/index.test.js.snap
+++ b/client/src/components/Draftail/__snapshots__/index.test.js.snap
@@ -7,6 +7,7 @@ Object {
   "autoComplete": null,
   "autoCorrect": null,
   "blockTypes": Array [],
+  "bottomToolbar": null,
   "controls": Array [],
   "decorators": Array [],
   "enableHorizontalRule": Object {
@@ -25,8 +26,11 @@ Object {
   ],
   "inlineStyles": Array [],
   "maxListNesting": 4,
+  "onBlur": null,
+  "onFocus": null,
   "onSave": [Function],
   "placeholder": "Write here…",
+  "plugins": Array [],
   "rawContentState": null,
   "showRedoControl": Object {
     "description": "Redo",
@@ -39,6 +43,7 @@ Object {
   "stripPastedStyles": false,
   "textAlignment": null,
   "textDirectionality": null,
+  "topToolbar": [Function],
 }
 `;
 
diff --git a/package-lock.json b/package-lock.json
index 6828f796a6e8..d4d5b6ee2eee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2711,6 +2711,11 @@
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true
     },
+    "decorate-component-with-props": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/decorate-component-with-props/-/decorate-component-with-props-1.1.0.tgz",
+      "integrity": "sha512-tTYQojixN64yK3/WBODMfvss/zbmyUx9HQXhzSxZiSiofeekVeRyyuToy9BCiTMrVEIKWxTcla2t3y5qdaUF7Q=="
+    },
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
@@ -2963,24 +2968,38 @@
         "object-assign": "^4.1.0"
       }
     },
+    "draft-js-plugins-editor": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/draft-js-plugins-editor/-/draft-js-plugins-editor-2.1.1.tgz",
+      "integrity": "sha512-fKGe71irNvFHJ5L/lUrh+3vPkBNq0de6x+cgiZUJ9zQERc5KPBtGXIFiarLFVHyrRTCPq+K6xmgfFSAERaFHPw==",
+      "requires": {
+        "decorate-component-with-props": "^1.0.2",
+        "find-with-regex": "^1.1.3",
+        "immutable": "~3.7.4",
+        "prop-types": "^15.5.8",
+        "union-class-names": "^1.0.0"
+      }
+    },
     "draftail": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/draftail/-/draftail-0.17.2.tgz",
-      "integrity": "sha512-SPmd9k9cMH/4UmXK6F7uRx1sCtebcO2qFXjXA1R6BaR9gpCqfcKefxVZbgJ9RELpZ28xvNtTEjdtJqzUI1UPaw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/draftail/-/draftail-1.2.1.tgz",
+      "integrity": "sha512-YL0QjfUxneOzwGaO1t66H47cFN82zGjrvw+0ERHpFGtUPjfrD7uCKlfXhPg1mOJgFFxuc44p7M5fUlrS1asBYg==",
       "requires": {
-        "draftjs-conductor": "^0.2.1",
-        "draftjs-filters": "^1.0.0"
+        "decorate-component-with-props": "^1.0.2",
+        "draft-js-plugins-editor": "^2.1.1",
+        "draftjs-conductor": "^0.4.1",
+        "draftjs-filters": "^2.2.3"
       }
     },
     "draftjs-conductor": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/draftjs-conductor/-/draftjs-conductor-0.2.1.tgz",
-      "integrity": "sha512-oazG/8otKjTZ1OdAA0BDaYiRsi4tJd0UmNjtIFebaqWUryyr76JyA2j/trFejEHQuNnSHjjeci4s9Jn4sxXPEA=="
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/draftjs-conductor/-/draftjs-conductor-0.4.1.tgz",
+      "integrity": "sha512-5BcJLdYLNIA/TNp/9xwIeD1quWsWEoi0ZI81TiW3vLecBEQgWKVxuKZaLdaXHYpW4/kdQvAJz2KcOBTpJkYBxg=="
     },
     "draftjs-filters": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/draftjs-filters/-/draftjs-filters-1.0.0.tgz",
-      "integrity": "sha512-OUXPZs/tYqge4BzPjA2+kiB0xcqxh4afPXq7c23YfRNrZM/tzRf8Ft2CXxOxR4j17xdBadD0qO0DXii0xFm6Rg=="
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/draftjs-filters/-/draftjs-filters-2.2.3.tgz",
+      "integrity": "sha512-xbpXgjTtFzaMp9P9xlaqmf3NpP4yYM3OT3HbodUQpI4t2kO9ltJTo0+3H+1PlsUPKoc7jPthiE0MYN/VMrsuNw=="
     },
     "duplexer": {
       "version": "0.1.1",
@@ -3857,6 +3876,11 @@
         "locate-path": "^2.0.0"
       }
     },
+    "find-with-regex": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/find-with-regex/-/find-with-regex-1.1.3.tgz",
+      "integrity": "sha512-zkEVQ1H3PIQL/19ADKt1lCQU4QGM3OneiderUcFgn5EgTm/TnoUh7HxPAwP8w/vXxWSLC6KtpbDQpypJ5+majw=="
+    },
     "findup-sync": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
@@ -12853,6 +12877,11 @@
         "x-is-string": "^0.1.0"
       }
     },
+    "union-class-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/union-class-names/-/union-class-names-1.0.0.tgz",
+      "integrity": "sha1-kllgitrMOQlKKwz+FseOYgBheEc="
+    },
     "union-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
diff --git a/package.json b/package.json
index 5940bde925cd..25021f547d4e 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
   "dependencies": {
     "core-js": "^2.5.3",
     "draft-js": "0.10.5",
-    "draftail": "^0.17.2",
+    "draftail": "^1.2.1",
     "element-closest": "^2.0.2",
     "focus-trap-react": "^3.1.0",
     "prop-types": "^15.6.0",