diff --git a/src/RichText.js b/src/RichText.js
index ba7a5f219e..4ad9369711 100644
--- a/src/RichText.js
+++ b/src/RichText.js
@@ -141,7 +141,8 @@ export function modifyText(contentState: ContentState, rangeToReplace: Selection
     for(let currentKey = startKey;
             currentKey && currentKey !== endKey;
             currentKey = contentState.getKeyAfter(currentKey)) {
-        text += getText(currentKey).substring(startOffset, blockText.length);
+        let blockText = getText(currentKey);
+        text += blockText.substring(startOffset, blockText.length);
 
         // from now on, we'll take whole blocks
         startOffset = 0;
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 09f208b035..b6f029e139 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -199,7 +199,7 @@ export default class MessageComposerInput extends React.Component {
                 if (contentJSON) {
                     let content = convertFromRaw(JSON.parse(contentJSON));
                     component.setState({
-                        editorState: component.createEditorState(this.state.isRichtextEnabled, content)
+                        editorState: component.createEditorState(component.state.isRichtextEnabled, content)
                     });
                 }
             }