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
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) {