diff --git a/src/components/views/elements/MessageEditor.js b/src/components/views/elements/MessageEditor.js
index a2005feace..20d6dc6f66 100644
--- a/src/components/views/elements/MessageEditor.js
+++ b/src/components/views/elements/MessageEditor.js
@@ -110,9 +110,15 @@ export default class MessageEditor extends React.Component {
             "msgtype": "m.text",
             "body": textSerialize(this.model),
         };
+        const contentBody = {
+            msgtype: newContent.msgtype,
+            body: ` * ${newContent.body}`,
+        };
         if (requiresHtml(this.model)) {
             newContent.format = "org.matrix.custom.html";
             newContent.formatted_body = htmlSerialize(this.model);
+            contentBody.format = newContent.format;
+            contentBody.formatted_body = ` * ${newContent.formatted_body}`;
         }
         const content = Object.assign({
             "m.new_content": newContent,
@@ -120,7 +126,7 @@ export default class MessageEditor extends React.Component {
                 "rel_type": "m.replace",
                 "event_id": this.props.event.getId(),
             },
-        }, newContent);
+        }, contentBody);
 
         const roomId = this.props.event.getRoomId();
         this.context.matrixClient.sendMessage(roomId, content);