diff --git a/src/Markdown.js b/src/Markdown.js
index 80d1aa4335..3506e3cb59 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -59,7 +59,7 @@ export default class Markdown {
         return is_plain;
     }
 
-    toHTML(html) {
+    toHTML() {
         const real_paragraph = this.renderer.paragraph;
 
         this.renderer.paragraph = function(node, entering) {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 41b27c1394..b6af5a9f09 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -526,7 +526,7 @@ export default class MessageComposerInput extends React.Component {
             if (md.isPlainText()) {
                 contentText = md.toPlaintext();
             } else {
-                contentHTML = md.toHTML(true);
+                contentHTML = md.toHTML();
             }
         }
 
diff --git a/src/components/views/rooms/MessageComposerInputOld.js b/src/components/views/rooms/MessageComposerInputOld.js
index 91abd5a2a8..ed4533737f 100644
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@@ -331,7 +331,7 @@ module.exports = React.createClass({
                 MatrixClientPeg.get().sendHtmlMessage(this.props.room.roomId, contentText, htmlText);
         }
         else {
-            const contentText = mdown.toPlaintext(false);
+            const contentText = mdown.toPlaintext();
             sendMessagePromise = isEmote ?
                 MatrixClientPeg.get().sendEmoteMessage(this.props.room.roomId, contentText) :
                 MatrixClientPeg.get().sendTextMessage(this.props.room.roomId, contentText);