diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index 39fafe486c..628e030ddb 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -282,7 +282,7 @@ export default class EditMessageComposer extends React.Component {
 
     onAction = payload => {
         if (payload.action === "edit_composer_insert" && this._editorRef) {
-            if (payload.user_id) {
+            if (payload.userId) {
                 this._editorRef.insertMention(payload.userId);
             } else if (payload.event) {
                 this._editorRef.insertQuotedMessage(payload.event);
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index ab6aac8be8..14893a6bd2 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -488,7 +488,7 @@ export default class SendMessageComposer extends React.Component {
                 } else if (payload.event) {
                     this._editorRef && this._editorRef.insertQuotedMessage(payload.event);
                 } else if (payload.text) {
-                    this._editorRef && this._editorRef.insertPlaintext(payload.emoji);
+                    this._editorRef && this._editorRef.insertPlaintext(payload.text);
                 }
                 break;
         }