diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index c1d42ffd0d..c89ec44435 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -131,6 +131,24 @@ function createRoomTagsAction(matrixClient, roomTagsEvent, room) {
     return { action: 'MatrixActions.Room.tags', room };
 }
 
+/**
+ * Create a MatrixActions.Room.receipt action that represents a MatrixClient
+ * `Room.receipt` event, each parameter mapping to a key-value in the action.
+ *
+ * @param {MatrixClient} matrixClient the matrix client
+ * @param {MatrixEvent} event the receipt event.
+ * @param {Room} room the room the receipt happened in.
+ * @returns {Object} an action of type MatrixActions.Room.receipt.
+ */
+function createRoomReceiptAction(matrixClient, event, room) {
+    return {
+        action: 'MatrixActions.Room.receipt',
+        event,
+        room,
+        matrixClient,
+    };
+}
+
 /**
  * @typedef RoomTimelineAction
  * @type {Object}
@@ -233,6 +251,7 @@ export default {
         this._addMatrixClientListener(matrixClient, 'Room.accountData', createRoomAccountDataAction);
         this._addMatrixClientListener(matrixClient, 'Room', createRoomAction);
         this._addMatrixClientListener(matrixClient, 'Room.tags', createRoomTagsAction);
+        this._addMatrixClientListener(matrixClient, 'Room.receipt', createRoomReceiptAction);
         this._addMatrixClientListener(matrixClient, 'Room.timeline', createRoomTimelineAction);
         this._addMatrixClientListener(matrixClient, 'Room.myMembership', createSelfMembershipAction);
         this._addMatrixClientListener(matrixClient, 'Event.decrypted', createEventDecryptedAction);
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 58300e43ea..30d14351e0 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -93,6 +93,20 @@ class RoomListStore extends Store {
                 this._generateInitialRoomLists();
             }
             break;
+            case 'MatrixActions.Room.receipt': {
+                if (!logicallyReady) break;
+
+                // First see if the receipt event is for our own user
+                const myUserId = this._matrixClient.getUserId();
+                for (const eventId of Object.keys(payload.event.getContent())) {
+                    const receiptUsers = Object.keys(payload.event.getContent()[eventId]['m.read'] || {});
+                    if (receiptUsers.includes(myUserId)) {
+                        this._roomUpdateTriggered(payload.room.roomId);
+                        return;
+                    }
+                }
+            }
+            break;
             case 'MatrixActions.Room.tags': {
                 if (!logicallyReady) break;
                 // TODO: Figure out which rooms changed in the tag and only change those.
@@ -212,7 +226,8 @@ class RoomListStore extends Store {
         if (!room) return;
 
         if (this._state.stickyRoomId !== room.roomId) {
-            this._setRoomCategory(room, this._calculateCategory(room));
+            const category = this._calculateCategory(room);
+            this._setRoomCategory(room, category);
         }
     }