Merge branch 'develop' into luke/room-list-flux

src/stores/RoomViewStore.js

@@ -132,6 +132,8 @@ class RoomViewStore extends Store {
                 shouldPeek: payload.should_peek === undefined ? true : payload.should_peek,
                 // have we sent a join request for this room and are waiting for a response?
                 joining: payload.joining || false,
+                // Reset quotingEvent because we don't want cross-room because bad UX
+                quotingEvent: null,
             };
 
             if (this._state.forwardingEvent) {

src/stores/TagOrderStore.js

@@ -48,7 +48,7 @@ class TagOrderStore extends Store {
         switch (payload.action) {
             // Initialise state after initial sync
             case 'MatrixActions.sync': {
-                if (!(payload.prevState === 'PREPARED' && payload.state === 'SYNCING')) {
+                if (!(payload.prevState !== 'PREPARED' && payload.state === 'PREPARED')) {
                     break;
                 }
                 const tagOrderingEvent = payload.matrixClient.getAccountData('im.vector.web.tag_ordering');