From 3e956514b3c9bd3c9a3879e065db4cd4f08fe104 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Jul 2018 11:00:45 +0100
Subject: [PATCH] also prevent merge/skip on rich text pastes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index c20f6fb52c..03ca16c72c 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -980,9 +980,15 @@ export default class MessageComposerInput extends React.Component {
                 // that we will silently discard nested blocks (e.g. nested lists) :(
                 const fragment = this.html.deserialize(transfer.html);
                 if (this.state.isRichTextEnabled) {
-                    return change.insertFragment(fragment.document);
+                    return change
+                        .setOperationFlag("skip", false)
+                        .setOperationFlag("merge", false)
+                        .insertFragment(fragment.document);
                 } else {
-                    return change.insertText(this.md.serialize(fragment));
+                    return change
+                        .setOperationFlag("skip", false)
+                        .setOperationFlag("merge", false)
+                        .insertText(this.md.serialize(fragment));
                 }
             }
             case 'text':