diff --git a/client/src/components/Draftail/Draftail.scss b/client/src/components/Draftail/Draftail.scss
index ef4511f94..06031cf15 100644
--- a/client/src/components/Draftail/Draftail.scss
+++ b/client/src/components/Draftail/Draftail.scss
@@ -23,14 +23,6 @@ $draftail-editor-font-family: $font-serif;
 @import './blocks/ImageBlock';
 @import './blocks/EmbedBlock';
 
-// Give each block element eg. paragraph some spacing so we don't end up
-// with empty paragraphs in code when user double enters because they think
-// there are no paragraphs.
-.Draftail-unstyled,
-.public-DraftEditorPlaceholder-inner {
-    margin: 0.5rem 0;
-}
-
 @include draftail-richtext-styles {
     h1,
     h2,
diff --git a/package-lock.json b/package-lock.json
index 217c3acb6..8c434a322 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2619,17 +2619,17 @@
       }
     },
     "draftail": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/draftail/-/draftail-0.12.0.tgz",
-      "integrity": "sha512-GGXOBRUt2bxrtzOBnqrUoCeK82sm5N9e0LMMSQSp9c7IPBAPwi3zXqCDA4BxKO1OzOGhxl9x1Z/s3E8wdIn2OQ==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/draftail/-/draftail-0.13.0.tgz",
+      "integrity": "sha512-NqXu4JC44vE3o9PjtJeP+T/n7JSold2PRBPLP8sawiPyZHJ6OAuhJoZ/V2Kzruzo87tFO/r4dXU8L46mVwVYKQ==",
       "requires": {
-        "draftjs-filters": "0.4.0"
+        "draftjs-filters": "0.5.0"
       }
     },
     "draftjs-filters": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/draftjs-filters/-/draftjs-filters-0.4.0.tgz",
-      "integrity": "sha512-inL6hcI9MXYKTM9GsTMI8K7Kj6xWVHhdJktAIt30azbxlLNQI+yHJ3Tohl+FpHcpP7oPSutvMlt2HqyZASipyQ=="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/draftjs-filters/-/draftjs-filters-0.5.0.tgz",
+      "integrity": "sha512-JjWH6GH1YZx2SPC0DOyoG4LmleTGLX2IJS7/6TH+yVAN5uwCPVxuADqQISG68mCTEr/PGSmmz8QJ/xg3Lp733g=="
     },
     "duplexer": {
       "version": "0.1.1",
diff --git a/package.json b/package.json
index af531d952..80c1d3ec5 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
   "dependencies": {
     "core-js": "^2.5.3",
     "draft-js": "^0.10.4",
-    "draftail": "^0.12.0",
+    "draftail": "^0.13.0",
     "focus-trap-react": "^3.1.0",
     "prop-types": "^15.6.0",
     "react": "^16.2.0",
diff --git a/wagtail/images/wagtail_hooks.py b/wagtail/images/wagtail_hooks.py
index 640ef7b7a..0a8d3ea06 100644
--- a/wagtail/images/wagtail_hooks.py
+++ b/wagtail/images/wagtail_hooks.py
@@ -97,7 +97,7 @@ def register_image_feature(features):
             'attributes': ['id', 'src', 'alt', 'format'],
             # Keep only images which are from Wagtail.
             'whitelist': {
-                'id': '.*',
+                'id': True,
             }
         })
     )