diff --git a/src/organisms/RoomView.js b/src/organisms/RoomView.js
index bf921b063f..bc23fc0132 100644
--- a/src/organisms/RoomView.js
+++ b/src/organisms/RoomView.js
@@ -11,12 +11,27 @@ module.exports = React.createClass({
         }
     },
 
+    componentWillMount: function() {
+        MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
+    },
+
+    componentWillUnmount: function() {
+        MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
+    },
+
     componentWillReceiveProps: function(props) {
         this.setState({
             room: MatrixClientPeg.get().getRoom(props.room_id)
         });
     },
 
+    onRoomTimeline: function(ev, room, toStartOfTimeline) {
+        if (room.roomId != this.props.room_id) return;
+        this.setState({
+            room: MatrixClientPeg.get().getRoom(this.props.room_id)
+        });
+    },
+
     getMessageTiles: function() {
         return this.state.room.timeline.map(function(mxEv) {
             return (