diff --git a/core/server/models/post.js b/core/server/models/post.js
index 6226b3edf2..3fff59216a 100644
--- a/core/server/models/post.js
+++ b/core/server/models/post.js
@@ -8,7 +8,8 @@ var _               = require('lodash'),
     Showdown        = require('showdown-ghost'),
     legacyConverter = new Showdown.converter({extensions: ['ghostgfm', 'footnotes', 'highlight']}),
     Mobiledoc       = require('mobiledoc-html-renderer').default,
-    converter       = new Mobiledoc({cards:[{name: 'html-card',type: 'html',render: function (opts) {return opts.payload.html;}}]}),
+    mobileDocOptions = require('ghost-editor').htmlOptions,
+    converter       = new Mobiledoc(mobileDocOptions),
     ghostBookshelf  = require('./base'),
     events          = require('../events'),
     config          = require('../config'),
diff --git a/package.json b/package.json
index 84a8f9cba4..40b09b83dc 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "express-hbs": "1.0.3",
     "extract-zip-fork": "1.5.1",
     "fs-extra": "0.30.0",
+    "ghost-editor": "0.0.10",
     "ghost-gql": "0.0.5",
     "glob": "5.0.15",
     "gscan": "0.0.15",