diff --git a/src/PageTypes.js b/src/PageTypes.js
new file mode 100644
index 0000000000..b2e2ecf4bc
--- /dev/null
+++ b/src/PageTypes.js
@@ -0,0 +1,24 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/** The types of page which can be shown by the LoggedInView */
+export default {
+    RoomView: "room_view",
+    UserSettings: "user_settings",
+    CreateRoom: "create_room",
+    RoomDirectory: "room_directory",
+    UserView: "user_view",
+};
diff --git a/src/component-index.js b/src/component-index.js
index 8fbf655879..50a02e0862 100644
--- a/src/component-index.js
+++ b/src/component-index.js
@@ -31,6 +31,8 @@ import structures$CreateRoom from './components/structures/CreateRoom';
 structures$CreateRoom && (module.exports.components['structures.CreateRoom'] = structures$CreateRoom);
 import structures$FilePanel from './components/structures/FilePanel';
 structures$FilePanel && (module.exports.components['structures.FilePanel'] = structures$FilePanel);
+import structures$LoggedInView from './components/structures/LoggedInView';
+structures$LoggedInView && (module.exports.components['structures.LoggedInView'] = structures$LoggedInView);
 import structures$MatrixChat from './components/structures/MatrixChat';
 structures$MatrixChat && (module.exports.components['structures.MatrixChat'] = structures$MatrixChat);
 import structures$MessagePanel from './components/structures/MessagePanel';
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
new file mode 100644
index 0000000000..ea3f46d3d1
--- /dev/null
+++ b/src/components/structures/LoggedInView.js
@@ -0,0 +1,215 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import * as Matrix from 'matrix-js-sdk';
+import React from 'react';
+
+import KeyCode from '../../KeyCode';
+import Notifier from '../../Notifier';
+import PageTypes from '../../PageTypes';
+import sdk from '../../index';
+
+/**
+ * This is what our MatrixChat shows when we are logged in. The precise view is
+ * determined by the page_type property.
+ *
+ * Currently it's very tightly coupled with MatrixChat. We should try to do
+ * something about that.
+ */
+export default React.createClass({
+    displayName: 'LoggedInView',
+
+    propTypes: {
+        matrixClient: React.PropTypes.instanceOf(Matrix.MatrixClient).isRequired,
+        page_type: React.PropTypes.string.isRequired,
+        onRoomIdResolved: React.PropTypes.func,
+        onRoomCreated: React.PropTypes.func,
+        onUserSettingsClose: React.PropTypes.func,
+
+        // and lots and lots of other stuff.
+    },
+
+    componentWillMount: function() {
+        // _scrollStateMap is a map from room id to the scroll state returned by
+        // RoomView.getScrollState()
+        this._scrollStateMap = {};
+
+        document.addEventListener('keydown', this._onKeyDown);
+    },
+
+    componentWillUnmount: function() {
+        document.removeEventListener('keydown', this._onKeyDown);
+    },
+
+    getScrollStateForRoom: function(roomId) {
+        return this._scrollStateMap[roomId];
+    },
+
+    _onKeyDown: function(ev) {
+            /*
+            // Remove this for now as ctrl+alt = alt-gr so this breaks keyboards which rely on alt-gr for numbers
+            // Will need to find a better meta key if anyone actually cares about using this.
+            if (ev.altKey && ev.ctrlKey && ev.keyCode > 48 && ev.keyCode < 58) {
+                dis.dispatch({
+                    action: 'view_indexed_room',
+                    roomIndex: ev.keyCode - 49,
+                });
+                ev.stopPropagation();
+                ev.preventDefault();
+                return;
+            }
+            */
+
+        var handled = false;
+
+        switch (ev.keyCode) {
+            case KeyCode.UP:
+            case KeyCode.DOWN:
+                if (ev.altKey) {
+                    var action = ev.keyCode == KeyCode.UP ?
+                        'view_prev_room' : 'view_next_room';
+                    dis.dispatch({action: action});
+                    handled = true;
+                }
+                break;
+
+            case KeyCode.PAGE_UP:
+            case KeyCode.PAGE_DOWN:
+                this._onScrollKeyPressed(ev);
+                handled = true;
+                break;
+
+            case KeyCode.HOME:
+            case KeyCode.END:
+                if (ev.ctrlKey) {
+                    this._onScrollKeyPressed(ev);
+                    handled = true;
+                }
+                break;
+        }
+
+        if (handled) {
+            ev.stopPropagation();
+            ev.preventDefault();
+        }
+    },
+
+    /** dispatch a page-up/page-down/etc to the appropriate component */
+    _onScrollKeyPressed: function(ev) {
+        if (this.refs.roomView) {
+            this.refs.roomView.handleScrollKey(ev);
+        }
+    },
+
+    render: function() {
+        var LeftPanel = sdk.getComponent('structures.LeftPanel');
+        var RightPanel = sdk.getComponent('structures.RightPanel');
+        var RoomView = sdk.getComponent('structures.RoomView');
+        var UserSettings = sdk.getComponent('structures.UserSettings');
+        var CreateRoom = sdk.getComponent('structures.CreateRoom');
+        var RoomDirectory = sdk.getComponent('structures.RoomDirectory');
+        var MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
+        var GuestWarningBar = sdk.getComponent('globals.GuestWarningBar');
+        var NewVersionBar = sdk.getComponent('globals.NewVersionBar');
+
+        var page_element;
+        var right_panel = '';
+
+        switch (this.props.page_type) {
+            case PageTypes.RoomView:
+                page_element = <RoomView
+                        ref='roomView'
+                        roomAddress={this.props.currentRoomAlias || this.props.currentRoomId}
+                        autoJoin={this.props.autoJoin}
+                        onRoomIdResolved={this.props.onRoomIdResolved}
+                        eventId={this.props.initialEventId}
+                        thirdPartyInvite={this.props.thirdPartyInvite}
+                        oobData={this.props.roomOobData}
+                        highlightedEventId={this.props.highlightedEventId}
+                        eventPixelOffset={this.props.initialEventPixelOffset}
+                        key={this.props.currentRoomAlias || this.props.currentRoomId}
+                        opacity={this.props.middleOpacity}
+                        collapsedRhs={this.props.collapse_rhs}
+                        ConferenceHandler={this.props.ConferenceHandler}
+                        scrollStateMap={this._scrollStateMap}
+                    />
+                if (!this.props.collapse_rhs) right_panel = <RightPanel roomId={this.props.currentRoomId} opacity={this.props.sideOpacity} />
+                break;
+
+            case PageTypes.UserSettings:
+                page_element = <UserSettings
+                    onClose={this.props.onUserSettingsClose}
+                    version={this.props.version}
+                    brand={this.props.config.brand}
+                    collapsedRhs={this.props.collapse_rhs}
+                    enableLabs={this.props.config.enableLabs}
+                />
+                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>
+                break;
+
+            case PageTypes.CreateRoom:
+                page_element = <CreateRoom
+                    onRoomCreated={this.props.onRoomCreated}
+                    collapsedRhs={this.props.collapse_rhs}
+                />
+                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>
+                break;
+
+            case PageTypes.RoomDirectory:
+                page_element = <RoomDirectory
+                    collapsedRhs={this.props.collapse_rhs}
+                    config={this.props.config.roomDirectory}
+                />
+                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>
+                break;
+            case PageTypes.UserView:
+                page_element = null; // deliberately null for now
+                right_panel = <RightPanel userId={this.props.viewUserId} opacity={this.props.sideOpacity} />
+                break;
+        }
+
+        var topBar;
+        if (this.props.hasNewVersion) {
+            topBar = <NewVersionBar version={this.props.version} newVersion={this.props.newVersion}
+                releaseNotes={this.state.newVersionReleaseNotes}
+            />;
+        }
+        else if (this.props.matrixClient.isGuest()) {
+            topBar = <GuestWarningBar />;
+        }
+        else if (Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) {
+            topBar = <MatrixToolbar />;
+        }
+
+        var bodyClasses = 'mx_MatrixChat';
+        if (topBar) {
+            bodyClasses += ' mx_MatrixChat_toolbarShowing';
+        }
+
+        return (
+            <div className='mx_MatrixChat_wrapper'>
+                {topBar}
+                <div className={bodyClasses}>
+                    <LeftPanel selectedRoom={this.props.currentRoomId} collapsed={this.props.collapse_lhs || false} opacity={this.props.sideOpacity}/>
+                    <main className='mx_MatrixChat_middlePanel'>
+                        {page_element}
+                    </main>
+                    {right_panel}
+                </div>
+            </div>
+        );
+    },
+});
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 8582b85d12..945088106b 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -22,7 +22,6 @@ var Matrix = require("matrix-js-sdk");
 var MatrixClientPeg = require("../../MatrixClientPeg");
 var PlatformPeg = require("../../PlatformPeg");
 var SdkConfig = require("../../SdkConfig");
-var Notifier = require("../../Notifier");
 var ContextualMenu = require("./ContextualMenu");
 var RoomListSorter = require("../../RoomListSorter");
 var UserActivity = require("../../UserActivity");
@@ -38,8 +37,8 @@ var Tinter = require("../../Tinter");
 var sdk = require('../../index');
 var Rooms = require('../../Rooms');
 var linkifyMatrix = require("../../linkify-matrix");
-var KeyCode = require('../../KeyCode');
 var Lifecycle = require('../../Lifecycle');
+var PageTypes = require('../../PageTypes');
 
 var createRoom = require("../../createRoom");
 
@@ -67,14 +66,6 @@ module.exports = React.createClass({
         defaultDeviceDisplayName: React.PropTypes.string,
     },
 
-    PageTypes: {
-        RoomView: "room_view",
-        UserSettings: "user_settings",
-        CreateRoom: "create_room",
-        RoomDirectory: "room_directory",
-        UserView: "user_view",
-    },
-
     AuxPanel: {
         RoomSettings: "room_settings",
     },
@@ -192,10 +183,6 @@ module.exports = React.createClass({
         this.dispatcherRef = dis.register(this.onAction);
 
         this.focusComposer = false;
-        // scrollStateMap is a map from room id to the scroll state returned by
-        // RoomView.getScrollState()
-        this.scrollStateMap = {};
-        document.addEventListener("keydown", this.onKeyDown);
         window.addEventListener("focus", this.onFocus);
 
         // this can technically be done anywhere but doing this here keeps all
@@ -234,7 +221,6 @@ module.exports = React.createClass({
     componentWillUnmount: function() {
         Lifecycle.stopMatrixClient();
         dis.unregister(this.dispatcherRef);
-        document.removeEventListener("keydown", this.onKeyDown);
         window.removeEventListener("focus", this.onFocus);
         window.removeEventListener('resize', this.handleResize);
     },
@@ -399,11 +385,11 @@ module.exports = React.createClass({
                 }
                 break;
             case 'view_user_settings':
-                this._setPage(this.PageTypes.UserSettings);
+                this._setPage(PageTypes.UserSettings);
                 this.notifyNewScreen('settings');
                 break;
             case 'view_create_room':
-                //this._setPage(this.PageTypes.CreateRoom);
+                //this._setPage(PageTypes.CreateRoom);
                 //this.notifyNewScreen('new');
 
                 var TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
@@ -421,7 +407,7 @@ module.exports = React.createClass({
                 });
                 break;
             case 'view_room_directory':
-                this._setPage(this.PageTypes.RoomDirectory);
+                this._setPage(PageTypes.RoomDirectory);
                 this.notifyNewScreen('directory');
                 break;
             case 'view_create_chat':
@@ -481,9 +467,6 @@ module.exports = React.createClass({
     },
 
     _setPage: function(pageType) {
-        // record the scroll state if we're in a room view.
-        this._updateScrollMap();
-
         this.setState({
             page_type: pageType,
         });
@@ -506,16 +489,13 @@ module.exports = React.createClass({
     //                               that has been passed out-of-band (eg.
     //                               room name and avatar from an invite email)
     _viewRoom: function(room_info) {
-        // before we switch room, record the scroll state of the current room
-        this._updateScrollMap();
-
         this.focusComposer = true;
 
         var newState = {
             initialEventId: room_info.event_id,
             highlightedEventId: room_info.event_id,
             initialEventPixelOffset: undefined,
-            page_type: this.PageTypes.RoomView,
+            page_type: PageTypes.RoomView,
             thirdPartyInvite: room_info.third_party_invite,
             roomOobData: room_info.oob_data,
             currentRoomAlias: room_info.room_alias,
@@ -528,8 +508,10 @@ module.exports = React.createClass({
 
         // if we aren't given an explicit event id, look for one in the
         // scrollStateMap.
-        if (!room_info.event_id) {
-            var scrollState = this.scrollStateMap[room_info.room_id];
+        //
+        // TODO: do this in RoomView rather than here
+        if (!room_info.event_id && this.refs.loggedInView) {
+            var scrollState = this.refs.loggedInView.getScrollStateForRoom(room_info.room_id);
             if (scrollState) {
                 newState.initialEventId = scrollState.focussedEvent;
                 newState.initialEventPixelOffset = scrollState.pixelOffset;
@@ -566,10 +548,6 @@ module.exports = React.createClass({
             newState.ready = true;
         }
         this.setState(newState);
-
-        if (this.refs.roomView && room_info.showSettings) {
-            this.refs.roomView.showSettings(true);
-        }
     },
 
     _createChat: function() {
@@ -589,21 +567,6 @@ module.exports = React.createClass({
         });
     },
 
-    // update scrollStateMap according to the current scroll state of the
-    // room view.
-    _updateScrollMap: function() {
-        if (!this.refs.roomView) {
-            return;
-        }
-        var roomview = this.refs.roomView;
-        var roomId = this.refs.roomView.getRoomId();
-        if (!roomId) {
-            return;
-        }
-        var state = roomview.getScrollState();
-        this.scrollStateMap[roomId] = state;
-    },
-
     /**
      * Called when the sessionloader has finished
      */
@@ -664,12 +627,12 @@ module.exports = React.createClass({
                         firstRoom = RoomListSorter.mostRecentActivityFirst(
                             cli.getRooms()
                         )[0].roomId;
-                        self.setState({ready: true, currentRoomId: firstRoom, page_type: self.PageTypes.RoomView});
+                        self.setState({ready: true, currentRoomId: firstRoom, page_type: PageTypes.RoomView});
                     } else {
-                        self.setState({ready: true, page_type: self.PageTypes.RoomDirectory});
+                        self.setState({ready: true, page_type: PageTypes.RoomDirectory});
                     }
                 } else {
-                    self.setState({ready: true, page_type: self.PageTypes.RoomView});
+                    self.setState({ready: true, page_type: PageTypes.RoomView});
                 }
 
                 // we notifyNewScreen now because now the room will actually be displayed,
@@ -712,62 +675,6 @@ module.exports = React.createClass({
         });
     },
 
-    onKeyDown: function(ev) {
-            /*
-            // Remove this for now as ctrl+alt = alt-gr so this breaks keyboards which rely on alt-gr for numbers
-            // Will need to find a better meta key if anyone actually cares about using this.
-            if (ev.altKey && ev.ctrlKey && ev.keyCode > 48 && ev.keyCode < 58) {
-                dis.dispatch({
-                    action: 'view_indexed_room',
-                    roomIndex: ev.keyCode - 49,
-                });
-                ev.stopPropagation();
-                ev.preventDefault();
-                return;
-            }
-            */
-
-        var handled = false;
-
-        switch (ev.keyCode) {
-            case KeyCode.UP:
-            case KeyCode.DOWN:
-                if (ev.altKey) {
-                    var action = ev.keyCode == KeyCode.UP ?
-                        'view_prev_room' : 'view_next_room';
-                    dis.dispatch({action: action});
-                    handled = true;
-                }
-                break;
-
-            case KeyCode.PAGE_UP:
-            case KeyCode.PAGE_DOWN:
-                this._onScrollKeyPressed(ev);
-                handled = true;
-                break;
-
-            case KeyCode.HOME:
-            case KeyCode.END:
-                if (ev.ctrlKey) {
-                    this._onScrollKeyPressed(ev);
-                    handled = true;
-                }
-                break;
-        }
-
-        if (handled) {
-            ev.stopPropagation();
-            ev.preventDefault();
-        }
-    },
-
-    /** dispatch a page-up/page-down/etc to the appropriate component */
-    _onScrollKeyPressed(ev) {
-        if (this.refs.roomView) {
-            this.refs.roomView.handleScrollKey(ev);
-        }
-    },
-
     onFocus: function(ev) {
         dis.dispatch({action: 'focus_composer'});
     },
@@ -845,7 +752,7 @@ module.exports = React.createClass({
         } else if (screen.indexOf('user/') == 0) {
             var userId = screen.substring(5);
             this.setState({ viewUserId: userId });
-            this._setPage(this.PageTypes.UserView);
+            this._setPage(PageTypes.UserView);
             this.notifyNewScreen('user/' + userId);
             var member = new Matrix.RoomMember(null, userId);
             if (member) {
@@ -958,7 +865,7 @@ module.exports = React.createClass({
         // the page type still unset when the MatrixClient
         // is started and show the Room Directory instead.
         //this.showScreen("view_user_settings");
-        this._setPage(this.PageTypes.UserSettings);
+        this._setPage(PageTypes.UserSettings);
     },
 
     onFinishPostRegistration: function() {
@@ -1025,16 +932,8 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var LeftPanel = sdk.getComponent('structures.LeftPanel');
-        var RoomView = sdk.getComponent('structures.RoomView');
-        var RightPanel = sdk.getComponent('structures.RightPanel');
-        var UserSettings = sdk.getComponent('structures.UserSettings');
-        var CreateRoom = sdk.getComponent('structures.CreateRoom');
-        var RoomDirectory = sdk.getComponent('structures.RoomDirectory');
-        var MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
-        var GuestWarningBar = sdk.getComponent('globals.GuestWarningBar');
-        var NewVersionBar = sdk.getComponent('globals.NewVersionBar');
         var ForgotPassword = sdk.getComponent('structures.login.ForgotPassword');
+        var LoggedInView = sdk.getComponent('structures.LoggedInView');
 
         // console.log("rendering; loading="+this.state.loading+"; screen="+this.state.screen +
         //             "; logged_in="+this.state.logged_in+"; ready="+this.state.ready);
@@ -1053,90 +952,20 @@ module.exports = React.createClass({
                 <PostRegistration
                     onComplete={this.onFinishPostRegistration} />
             );
-        }
-        else if (this.state.logged_in && this.state.ready) {
-            var page_element;
-            var right_panel = "";
-
-            switch (this.state.page_type) {
-                case this.PageTypes.RoomView:
-                    page_element = <RoomView
-                        ref="roomView"
-                        roomAddress={this.state.currentRoomAlias || this.state.currentRoomId}
-                        autoJoin={this.state.autoJoin}
-                        onRoomIdResolved={this.onRoomIdResolved}
-                        eventId={this.state.initialEventId}
-                        thirdPartyInvite={this.state.thirdPartyInvite}
-                        oobData={this.state.roomOobData}
-                        highlightedEventId={this.state.highlightedEventId}
-                        eventPixelOffset={this.state.initialEventPixelOffset}
-                        key={this.state.currentRoomAlias || this.state.currentRoomId}
-                        opacity={this.state.middleOpacity}
-                        collapsedRhs={ this.state.collapse_rhs }
-                        ConferenceHandler={this.props.ConferenceHandler}
-                    />
-                    if (!this.state.collapse_rhs) right_panel = <RightPanel roomId={this.state.currentRoomId} opacity={this.state.sideOpacity} />
-                    break;
-                case this.PageTypes.UserSettings:
-                    page_element = <UserSettings
-                        onClose={this.onUserSettingsClose}
-                        version={this.state.version}
-                        brand={this.props.config.brand}
-                        collapsedRhs={ this.state.collapse_rhs }
-                        enableLabs={this.props.config.enableLabs}
-                    />
-                    if (!this.state.collapse_rhs) right_panel = <RightPanel opacity={this.state.sideOpacity}/>
-                    break;
-                case this.PageTypes.CreateRoom:
-                    page_element = <CreateRoom
-                        onRoomCreated={this.onRoomCreated}
-                        collapsedRhs={ this.state.collapse_rhs }
-                    />
-                    if (!this.state.collapse_rhs) right_panel = <RightPanel opacity={this.state.sideOpacity}/>
-                    break;
-                case this.PageTypes.RoomDirectory:
-                    page_element = <RoomDirectory
-                        collapsedRhs={ this.state.collapse_rhs }
-                        config={this.props.config.roomDirectory}
-                    />
-                    if (!this.state.collapse_rhs) right_panel = <RightPanel opacity={this.state.sideOpacity}/>
-                    break;
-                case this.PageTypes.UserView:
-                    page_element = null; // deliberately null for now
-                    right_panel = <RightPanel userId={this.state.viewUserId} opacity={this.state.sideOpacity} />
-                    break;
-            }
-
-            var topBar;
-            if (this.state.hasNewVersion) {
-                topBar = <NewVersionBar version={this.state.version} newVersion={this.state.newVersion}
-                    releaseNotes={this.state.newVersionReleaseNotes}
-                />;
-            }
-            else if (MatrixClientPeg.get().isGuest()) {
-                topBar = <GuestWarningBar />;
-            }
-            else if (Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) {
-                topBar = <MatrixToolbar />;
-            }
-
-            var bodyClasses = "mx_MatrixChat";
-            if (topBar) {
-                bodyClasses += " mx_MatrixChat_toolbarShowing";
-            }
-
+        } else if (this.state.logged_in && this.state.ready) {
+            /* for now, we stuff the entirety of our props and state into the LoggedInView.
+             * we should go through and figure out what we actually need to pass down, as well
+             * as using something like redux to avoid having a billion bits of state kicking around.
+             */
             return (
-                <div className="mx_MatrixChat_wrapper">
-                    {topBar}
-                    <div className={bodyClasses}>
-                        <LeftPanel selectedRoom={this.state.currentRoomId} collapsed={this.state.collapse_lhs || false} opacity={this.state.sideOpacity}/>
-                        <main className="mx_MatrixChat_middlePanel">
-                            {page_element}
-                        </main>
-                        {right_panel}
-                    </div>
-                </div>
-            );
+               <LoggedInView ref="loggedInView" matrixClient={MatrixClientPeg.get()}
+                    onRoomIdResolved={this.onRoomIdResolved}
+                    onRoomCreated={this.onRoomCreated}
+                    onUserSettingsClose={this.onUserSettingsClose}
+                    {...this.props}
+                    {...this.state}
+                />
+            )
         } else if (this.state.logged_in) {
             // we think we are logged in, but are still waiting for the /sync to complete
             var Spinner = sdk.getComponent('elements.Spinner');
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 9040e280f2..4e578d8d28 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -100,6 +100,21 @@ module.exports = React.createClass({
 
         // is the RightPanel collapsed?
         collapsedRhs: React.PropTypes.bool,
+
+        // a map from room id to scroll state, which will be updated on unmount.
+        //
+        // If there is no special scroll state (ie, we are following the live
+        // timeline), the scroll state is null. Otherwise, it is an object with
+        // the following properties:
+        //
+        //    focussedEvent: the ID of the 'focussed' event. Typically this is
+        //        the last event fully visible in the viewport, though if we
+        //        have done an explicit scroll to an explicit event, it will be
+        //        that event.
+        //
+        //    pixelOffset: the number of pixels the window is scrolled down
+        //        from the focussedEvent.
+        scrollStateMap: React.PropTypes.object,
     },
 
     getInitialState: function() {
@@ -307,6 +322,9 @@ module.exports = React.createClass({
         // (We could use isMounted, but facebook have deprecated that.)
         this.unmounted = true;
 
+        // update the scroll map before we get unmounted
+        this._updateScrollMap();
+
         if (this.refs.roomView) {
             // disconnect the D&D event listeners from the room view. This
             // is really just for hygiene - we're going to be
@@ -1203,22 +1221,25 @@ module.exports = React.createClass({
         }
     },
 
+    // update scrollStateMap on unmount
+    _updateScrollMap: function() {
+        if (!this.state.room) {
+            // we were instantiated on a room alias and haven't yet joined the room.
+            return;
+        }
+        if (!this.props.scrollStateMap) return;
+
+        var roomId = this.state.room.roomId;
+
+        var state = this._getScrollState();
+        this.props.scrollStateMap[roomId] = state;
+    },
+
+
     // get the current scroll position of the room, so that it can be
     // restored when we switch back to it.
     //
-    // If there is no special scroll state (ie, we are following the live
-    // timeline), returns null. Otherwise, returns an object with the following
-    // properties:
-    //
-    //    focussedEvent: the ID of the 'focussed' event. Typically this is the
-    //        last event fully visible in the viewport, though if we have done
-    //        an explicit scroll to an explicit event, it will be that event.
-    //
-    //    pixelOffset: the number of pixels the window is scrolled down from
-    //        the focussedEvent.
-    //
-    //
-    getScrollState: function() {
+    _getScrollState: function() {
         var messagePanel = this.refs.messagePanel;
         if (!messagePanel) return null;
 
@@ -1333,19 +1354,6 @@ module.exports = React.createClass({
         }
     },
 
-    /**
-     * Get the ID of the displayed room
-     *
-     * Returns null if the RoomView was instantiated on a room alias and
-     * we haven't yet joined the room.
-     */
-    getRoomId: function() {
-        if (!this.state.room) {
-            return null;
-        }
-        return this.state.room.roomId;
-    },
-
     /**
      * get any current call for this room
      */