From b110e315ecd6339108848f6cea23b7d336dabbf1 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Mon, 7 Dec 2015 11:36:28 +0000
Subject: [PATCH 1/2] Add removeFromQueue function to cancel sending a queued
 event

---
 src/Resend.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Resend.js b/src/Resend.js
index b1132750b8..0e67a306bd 100644
--- a/src/Resend.js
+++ b/src/Resend.js
@@ -21,4 +21,13 @@ module.exports = {
             event: event
         });
     },
+
+    removeFromQueue: function(event) {
+        MatrixClientPeg.get().getScheduler().removeEventFromQueue(event);
+        var room = MatrixClientPeg.get().getRoom(event.getRoomId());
+        if (!room) {
+            return;
+        }
+        room.removeEvents([event.getId()]);
+    }
 };
\ No newline at end of file

From b64e5d49cc9ce6cbabe9a643ba5c514d399c7428 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Mon, 7 Dec 2015 15:33:58 +0000
Subject: [PATCH 2/2] Add magic flag to say 'dump pending events to the end'

---
 src/components/structures/MatrixChat.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a6d6716222..25f25e919e 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -388,7 +388,9 @@ module.exports = React.createClass({
         Notifier.start();
         UserActivity.start();
         Presence.start();
-        cli.startClient();
+        cli.startClient({
+            pendingEventOrdering: "end"
+        });
     },
 
     onKeyDown: function(ev) {