diff --git a/src/component-index.js b/src/component-index.js
index e15f0e917f..8a4035811a 100644
--- a/src/component-index.js
+++ b/src/component-index.js
@@ -85,11 +85,14 @@ module.exports.components['views.rooms.MessageComposerInput'] = require('./compo
 module.exports.components['views.rooms.PresenceLabel'] = require('./components/views/rooms/PresenceLabel');
 module.exports.components['views.rooms.RoomHeader'] = require('./components/views/rooms/RoomHeader');
 module.exports.components['views.rooms.RoomList'] = require('./components/views/rooms/RoomList');
+module.exports.components['views.rooms.RoomNameEditor'] = require('./components/views/rooms/RoomNameEditor');
 module.exports.components['views.rooms.RoomPreviewBar'] = require('./components/views/rooms/RoomPreviewBar');
 module.exports.components['views.rooms.RoomSettings'] = require('./components/views/rooms/RoomSettings');
 module.exports.components['views.rooms.RoomTile'] = require('./components/views/rooms/RoomTile');
+module.exports.components['views.rooms.RoomTopicEditor'] = require('./components/views/rooms/RoomTopicEditor');
 module.exports.components['views.rooms.SearchableEntityList'] = require('./components/views/rooms/SearchableEntityList');
 module.exports.components['views.rooms.SearchResultTile'] = require('./components/views/rooms/SearchResultTile');
+module.exports.components['views.rooms.SimpleRoomHeader'] = require('./components/views/rooms/SimpleRoomHeader');
 module.exports.components['views.rooms.TabCompleteBar'] = require('./components/views/rooms/TabCompleteBar');
 module.exports.components['views.rooms.TopUnreadMessagesBar'] = require('./components/views/rooms/TopUnreadMessagesBar');
 module.exports.components['views.rooms.UserTile'] = require('./components/views/rooms/UserTile');
diff --git a/src/components/structures/CreateRoom.js b/src/components/structures/CreateRoom.js
index 116202d324..f6e2baeaf2 100644
--- a/src/components/structures/CreateRoom.js
+++ b/src/components/structures/CreateRoom.js
@@ -249,13 +249,13 @@ module.exports = React.createClass({
             var RoomAlias = sdk.getComponent("create_room.RoomAlias");
             var Presets = sdk.getComponent("create_room.Presets");
             var UserSelector = sdk.getComponent("elements.UserSelector");
-            var RoomHeader = sdk.getComponent("rooms.RoomHeader");
+            var SimpleRoomHeader = sdk.getComponent("rooms.SimpleRoomHeader");
 
             var domain = MatrixClientPeg.get().getDomain();
 
             return (
             <div className="mx_CreateRoom">
-                <RoomHeader simpleHeader="Create room" />
+                <SimpleRoomHeader title="CreateRoom" />
                 <div className="mx_CreateRoom_body">
                     <input type="text" ref="room_name" value={this.state.room_name} onChange={this.onNameChange} placeholder="Name"/> <br />
                     <textarea className="mx_CreateRoom_description" ref="topic" value={this.state.topic} onChange={this.onTopicChange} placeholder="Topic"/> <br />
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 1c1b0ede40..b5c34de20d 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -858,8 +858,14 @@ module.exports = React.createClass({
             uploadingRoomSettings: true,
         });
         
-        this.refs.room_settings.setName(this.refs.header.getRoomName());
-        this.refs.room_settings.setTopic(this.refs.header.getTopic());
+        var newName = this.refs.header.getEditedName();
+        if (newName !== undefined) {
+            this.refs.room_settings.setName(newName);
+        }
+        var newTopic = this.refs.header.getEditedTopic();
+        if (newTopic !== undefined) {
+            this.refs.room_settings.setTopic(newTopic);
+        }
         
         this.refs.room_settings.save().then((results) => {
             var fails = results.filter(function(result) { return result.state !== "fulfilled" });
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index bea55ae8a8..a5f2a59878 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -249,7 +249,7 @@ module.exports = React.createClass({
                 throw new Error("Unknown state.phase => " + this.state.phase);
         }
         // can only get here if phase is UserSettings.DISPLAY
-        var RoomHeader = sdk.getComponent('rooms.RoomHeader');
+        var SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
         var ChangeDisplayName = sdk.getComponent("views.settings.ChangeDisplayName");
         var ChangePassword = sdk.getComponent("views.settings.ChangePassword");
         var ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
@@ -331,7 +331,7 @@ module.exports = React.createClass({
 
         return (
             <div className="mx_UserSettings">
-                <RoomHeader simpleHeader="Settings" />
+                <SimpleRoomHeader title="Settings"/>
 
                 <GeminiScrollbar className="mx_UserSettings_body" autoshow={true}>
 
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 9a132a73f5..3e237a8f95 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -18,7 +18,6 @@ limitations under the License.
 
 var React = require('react');
 var sdk = require('../../../index');
-var dis = require("../../../dispatcher");
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 var Modal = require("../../../Modal");
 
@@ -49,31 +48,9 @@ module.exports = React.createClass({
         };
     },
 
-    getInitialState: function() {
-        return {};
-    },
-
-    componentWillMount: function() {
-        this._recalculateState();
-    },
-
-    componentWillReceiveProps: function(newProps) {
-        if (this.props.room !== newProps.room) {
-            this._recalculateState();
-        }
-    },
-
-    _recalculateState: function() {
-        if (!this.props.room) return;
-        
-        var topic = this.props.room.currentState.getStateEvents('m.room.topic', '');
-        var name = this.props.room.currentState.getStateEvents('m.room.name', '');
-
-        this.setState({
-            name: name ? name.getContent().name : '',
-            defaultName: this.props.room.getDefaultRoomName(MatrixClientPeg.get().credentials.userId),
-            topic: topic ? topic.getContent().topic : '',
-        });        
+    componentDidMount: function() {
+        var cli = MatrixClientPeg.get();
+        cli.on("RoomState.events", this._onRoomStateEvents);
     },
 
     componentDidUpdate: function() {
@@ -82,12 +59,20 @@ module.exports = React.createClass({
         }
     },
 
-    onNameChanged: function(value) {
-        this.setState({ name : value });
+    componentWillUnmount: function() {
+        var cli = MatrixClientPeg.get();
+        if (cli) {
+            cli.removeListener("RoomState.events", this._onRoomStateEvents);
+        }
     },
 
-    onTopicChanged: function(value) {
-        this.setState({ topic : value });
+    _onRoomStateEvents: function(event, state) {
+        if (!this.props.room || event.getRoomId() != this.props.room.roomId) {
+            return;
+        }
+
+        // redisplay the room name, topic, etc.
+        this.forceUpdate();
     },
 
     onAvatarPickerClick: function(ev) {
@@ -113,202 +98,193 @@ module.exports = React.createClass({
         }).done();
     },    
 
-    getRoomName: function() {
-        return this.state.name;
+    /**
+     * After editing the settings, get the new name for the room
+     *
+     * Returns undefined if we didn't let the user edit the room name
+     */
+    getEditedName: function() {
+        var newName;
+        if (this.refs.nameEditor) {
+            newName = this.refs.nameEditor.getRoomName();
+        }
+        return newName;
     },
 
-    getTopic: function() {
-        return this.state.topic;
+    /**
+     * After editing the settings, get the new topic for the room
+     *
+     * Returns undefined if we didn't let the user edit the room topic
+     */
+    getEditedTopic: function() {
+        var newTopic;
+        if (this.refs.topicEditor) {
+            newTopic = this.refs.topicEditor.getTopic();
+        }
+        return newTopic;
     },
 
     render: function() {
-        var EditableText = sdk.getComponent("elements.EditableText");
         var RoomAvatar = sdk.getComponent("avatars.RoomAvatar");
         var ChangeAvatar = sdk.getComponent("settings.ChangeAvatar");
         var TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         var header;
-        if (this.props.simpleHeader) {
-            var cancel;
-            if (this.props.onCancelClick) {
-                cancel = <img className="mx_RoomHeader_simpleHeaderCancel" src="img/cancel.svg" onClick={ this.props.onCancelClick } alt="Close" width="18" height="18"/>
-            }
-            header =
-                <div className="mx_RoomHeader_wrapper">
-                    <div className="mx_RoomHeader_simpleHeader">
-                        { this.props.simpleHeader }
-                        { cancel }
-                    </div>
-                </div>
+        var name = null;
+        var searchStatus = null;
+        var topic_el = null;
+        var cancel_button = null;
+        var save_button = null;
+        var settings_button = null;
+        if (this.props.editing) {
+
+            // calculate permissions.  XXX: this should be done on mount or something
+            var user_id = MatrixClientPeg.get().credentials.userId;
+
+            var can_set_room_name = this.props.room.currentState.maySendStateEvent(
+                'm.room.name', user_id
+            );
+            var can_set_room_avatar = this.props.room.currentState.maySendStateEvent(
+                'm.room.avatar', user_id
+            );
+            var can_set_room_topic = this.props.room.currentState.maySendStateEvent(
+                'm.room.topic', user_id
+            );
+            var can_set_room_name = this.props.room.currentState.maySendStateEvent(
+                'm.room.name', user_id
+            );
+
+            save_button = <div className="mx_RoomHeader_textButton" onClick={this.props.onSaveClick}>Save</div>
+            cancel_button = <div className="mx_RoomHeader_cancelButton" onClick={this.props.onCancelClick}><img src="img/cancel.svg" width="18" height="18" alt="Cancel"/> </div>
+        }
+
+        if (can_set_room_name) {
+            var RoomNameEditor = sdk.getComponent("rooms.RoomNameEditor");
+            name = <RoomNameEditor ref="nameEditor" room={this.props.room} />
         }
         else {
-            var name = null;
-            var searchStatus = null;
-            var topic_el = null;
-            var cancel_button = null;
-            var save_button = null;
-            var settings_button = null;
-            if (this.props.editing) {
-
-                // calculate permissions.  XXX: this should be done on mount or something
-                var user_id = MatrixClientPeg.get().credentials.userId;
-
-                var can_set_room_name = this.props.room.currentState.maySendStateEvent(
-                    'm.room.name', user_id
-                );
-                var can_set_room_avatar = this.props.room.currentState.maySendStateEvent(
-                    'm.room.avatar', user_id
-                );
-                var can_set_room_topic = this.props.room.currentState.maySendStateEvent(
-                    'm.room.topic', user_id
-                );
-                var can_set_room_name = this.props.room.currentState.maySendStateEvent(
-                    'm.room.name', user_id
-                );
-
-                var placeholderName = "Unnamed Room";
-                if (this.state.defaultName && this.state.defaultName !== 'Empty room') {
-                    placeholderName += " (" + this.state.defaultName + ")";
-                }
-
-                save_button = <div className="mx_RoomHeader_textButton" onClick={this.props.onSaveClick}>Save</div>
-                cancel_button = <div className="mx_RoomHeader_cancelButton" onClick={this.props.onCancelClick}><img src="img/cancel.svg" width="18" height="18" alt="Cancel"/> </div>
+            var searchStatus;
+            // don't display the search count until the search completes and
+            // gives us a valid (possibly zero) searchCount.
+            if (this.props.searchInfo && this.props.searchInfo.searchCount !== undefined && this.props.searchInfo.searchCount !== null) {
+                searchStatus = <div className="mx_RoomHeader_searchStatus">&nbsp;(~{ this.props.searchInfo.searchCount } results)</div>;
             }
 
-            if (can_set_room_name) {
-                name =
-                    <div className="mx_RoomHeader_name">
-                        <EditableText
-                             className="mx_RoomHeader_nametext mx_RoomHeader_editable"
-                             placeholderClassName="mx_RoomHeader_placeholder"
-                             placeholder={ placeholderName }
-                             blurToCancel={ false }
-                             onValueChanged={ this.onNameChanged }
-                             initialValue={ this.state.name }/>
-                    </div>
-            }
-            else {
-                var searchStatus;
-                // don't display the search count until the search completes and
-                // gives us a valid (possibly zero) searchCount.
-                if (this.props.searchInfo && this.props.searchInfo.searchCount !== undefined && this.props.searchInfo.searchCount !== null) {
-                    searchStatus = <div className="mx_RoomHeader_searchStatus">&nbsp;(~{ this.props.searchInfo.searchCount } results)</div>;
-                }
-
-                // XXX: this is a bit inefficient - we could just compare room.name for 'Empty room'...
-                var settingsHint = false;
-                var members = this.props.room ? this.props.room.getJoinedMembers() : undefined;
-                if (members) {
-                    if (members.length === 1 && members[0].userId === MatrixClientPeg.get().credentials.userId) {
-                        var name = this.props.room.currentState.getStateEvents('m.room.name', '');
-                        if (!name || !name.getContent().name) {
-                            settingsHint = true;
-                        }
+            // XXX: this is a bit inefficient - we could just compare room.name for 'Empty room'...
+            var settingsHint = false;
+            var members = this.props.room ? this.props.room.getJoinedMembers() : undefined;
+            if (members) {
+                if (members.length === 1 && members[0].userId === MatrixClientPeg.get().credentials.userId) {
+                    var name = this.props.room.currentState.getStateEvents('m.room.name', '');
+                    if (!name || !name.getContent().name) {
+                        settingsHint = true;
                     }
                 }
+            }
 
-                var roomName = 'Join Room';
-                if (this.props.oobData && this.props.oobData.name) {
-                    roomName = this.props.oobData.name;
-                } else if (this.props.room) {
-                    roomName = this.props.room.name;
-                }
+            var roomName = 'Join Room';
+            if (this.props.oobData && this.props.oobData.name) {
+                roomName = this.props.oobData.name;
+            } else if (this.props.room) {
+                roomName = this.props.room.name;
+            }
 
-                name =
-                    <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>
-                        <div className={ "mx_RoomHeader_nametext " + (settingsHint ? "mx_RoomHeader_settingsHint" : "") } title={ roomName }>{ roomName }</div>
-                        { searchStatus }
-                        <div className="mx_RoomHeader_settingsButton" title="Settings">
-                            <TintableSvg src="img/settings.svg" width="12" height="12"/>
-                        </div>
+            name =
+                <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>
+                    <div className={ "mx_RoomHeader_nametext " + (settingsHint ? "mx_RoomHeader_settingsHint" : "") } title={ roomName }>{ roomName }</div>
+                    { searchStatus }
+                    <div className="mx_RoomHeader_settingsButton" title="Settings">
+                        <TintableSvg src="img/settings.svg" width="12" height="12"/>
                     </div>
-            }
-
-            if (can_set_room_topic) {
-                topic_el =
-                    <EditableText 
-                         className="mx_RoomHeader_topic mx_RoomHeader_editable"
-                         placeholderClassName="mx_RoomHeader_placeholder"
-                         placeholder="Add a topic"
-                         blurToCancel={ false }
-                         onValueChanged={ this.onTopicChanged }
-                         initialValue={ this.state.topic }/>
-            } else {
-                if (this.state.topic)
-                    topic_el = <div className="mx_RoomHeader_topic" ref="topic" title={ this.state.topic }>{ this.state.topic }</div>;
-            }
-
-            var roomAvatar = null;
-            if (can_set_room_avatar) {
-                roomAvatar = (
-                    <div className="mx_RoomHeader_avatarPicker">
-                        <div onClick={ this.onAvatarPickerClick }>
-                            <ChangeAvatar ref="changeAvatar" room={this.props.room} showUploadSection={false} width={48} height={48} />
-                        </div>
-                        <div className="mx_RoomHeader_avatarPicker_edit">
-                            <label htmlFor="avatarInput" ref="file_label">
-                                <img src="img/camera.svg"
-                                    alt="Upload avatar" title="Upload avatar"
-                                    width="17" height="15" />
-                            </label>
-                            <input id="avatarInput" type="file" onChange={ this.onAvatarSelected }/>
-                        </div>
-                    </div>
-                );
-            }
-            else if (this.props.room || (this.props.oobData && this.props.oobData.name)) {
-                roomAvatar = (
-                    <div onClick={this.props.onSettingsClick}>
-                        <RoomAvatar room={this.props.room} width={48} height={48} oobData={this.props.oobData} />
-                    </div>
-                );
-            }
-
-            var leave_button;
-            if (this.props.onLeaveClick) {
-                leave_button =
-                    <div className="mx_RoomHeader_button mx_RoomHeader_leaveButton" onClick={this.props.onLeaveClick} title="Leave room">
-                        <TintableSvg src="img/leave.svg" width="26" height="20"/>
-                    </div>;
-            }
-
-            var forget_button;
-            if (this.props.onForgetClick) {
-                forget_button =
-                    <div className="mx_RoomHeader_button mx_RoomHeader_leaveButton" onClick={this.props.onForgetClick} title="Forget room">
-                        <TintableSvg src="img/leave.svg" width="26" height="20"/>
-                    </div>;
-            }
-
-            var right_row;
-            if (!this.props.editing) {
-                right_row = 
-                    <div className="mx_RoomHeader_rightRow">
-                        { forget_button }
-                        { leave_button }
-                        <div className="mx_RoomHeader_button" onClick={this.props.onSearchClick} title="Search">
-                            <TintableSvg src="img/search.svg" width="21" height="19"/>
-                        </div>
-                    </div>;
-            }
-
-            header =
-                <div className="mx_RoomHeader_wrapper">
-                    <div className="mx_RoomHeader_leftRow">
-                        <div className="mx_RoomHeader_avatar">
-                            { roomAvatar }
-                        </div>
-                        <div className="mx_RoomHeader_info">
-                            { name }
-                            { topic_el }
-                        </div>
-                    </div>
-                    {save_button}
-                    {cancel_button}
-                    {right_row}
                 </div>
         }
 
+        if (can_set_room_topic) {
+            var RoomTopicEditor = sdk.getComponent("rooms.RoomTopicEditor");
+            topic_el = <RoomTopicEditor ref="topicEditor" room={this.props.room} />
+        } else {
+            var topic;
+            if (this.props.room) {
+                var ev = this.props.room.currentState.getStateEvents('m.room.topic', '');
+                if (ev) {
+                    topic = ev.getContent().topic;
+                }
+            }
+            if (topic) {
+                topic_el = <div className="mx_RoomHeader_topic" ref="topic" title={ topic }>{ topic }</div>;
+            }
+        }
+
+        var roomAvatar = null;
+        if (can_set_room_avatar) {
+            roomAvatar = (
+                <div className="mx_RoomHeader_avatarPicker">
+                    <div onClick={ this.onAvatarPickerClick }>
+                        <ChangeAvatar ref="changeAvatar" room={this.props.room} showUploadSection={false} width={48} height={48} />
+                    </div>
+                    <div className="mx_RoomHeader_avatarPicker_edit">
+                        <label htmlFor="avatarInput" ref="file_label">
+                            <img src="img/camera.svg"
+                                alt="Upload avatar" title="Upload avatar"
+                                width="17" height="15" />
+                        </label>
+                        <input id="avatarInput" type="file" onChange={ this.onAvatarSelected }/>
+                    </div>
+                </div>
+            );
+        }
+        else if (this.props.room || (this.props.oobData && this.props.oobData.name)) {
+            roomAvatar = (
+                <div onClick={this.props.onSettingsClick}>
+                    <RoomAvatar room={this.props.room} width={48} height={48} oobData={this.props.oobData} />
+                </div>
+            );
+        }
+
+        var leave_button;
+        if (this.props.onLeaveClick) {
+            leave_button =
+                <div className="mx_RoomHeader_button mx_RoomHeader_leaveButton" onClick={this.props.onLeaveClick} title="Leave room">
+                    <TintableSvg src="img/leave.svg" width="26" height="20"/>
+                </div>;
+        }
+
+        var forget_button;
+        if (this.props.onForgetClick) {
+            forget_button =
+                <div className="mx_RoomHeader_button mx_RoomHeader_leaveButton" onClick={this.props.onForgetClick} title="Forget room">
+                    <TintableSvg src="img/leave.svg" width="26" height="20"/>
+                </div>;
+        }
+
+        var right_row;
+        if (!this.props.editing) {
+            right_row = 
+                <div className="mx_RoomHeader_rightRow">
+                    { forget_button }
+                    { leave_button }
+                    <div className="mx_RoomHeader_button" onClick={this.props.onSearchClick} title="Search">
+                        <TintableSvg src="img/search.svg" width="21" height="19"/>
+                    </div>
+                </div>;
+        }
+
+        header =
+            <div className="mx_RoomHeader_wrapper">
+                <div className="mx_RoomHeader_leftRow">
+                    <div className="mx_RoomHeader_avatar">
+                        { roomAvatar }
+                    </div>
+                    <div className="mx_RoomHeader_info">
+                        { name }
+                        { topic_el }
+                    </div>
+                </div>
+                {save_button}
+                {cancel_button}
+                {right_row}
+            </div>;
+
         return (
             <div className={ "mx_RoomHeader " + (this.props.editing ? "mx_RoomHeader_editing" : "") }>
                 { header }
diff --git a/src/components/views/rooms/RoomNameEditor.js b/src/components/views/rooms/RoomNameEditor.js
new file mode 100644
index 0000000000..773b713584
--- /dev/null
+++ b/src/components/views/rooms/RoomNameEditor.js
@@ -0,0 +1,63 @@
+/*
+Copyright 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.
+*/
+
+'use strict';
+
+var React = require('react');
+var sdk = require('../../../index');
+var MatrixClientPeg = require('../../../MatrixClientPeg');
+
+module.exports = React.createClass({
+    displayName: 'RoomNameEditor',
+
+    propTypes: {
+        room: React.PropTypes.object.isRequired,
+    },
+
+    componentWillMount: function() {
+        var room = this.props.room;
+        var name = room.currentState.getStateEvents('m.room.name', '');
+        var myId = MatrixClientPeg.get().credentials.userId;
+        var defaultName = room.getDefaultRoomName(myId);
+
+        this._initialName = name ? name.getContent().name : '';
+
+        this._placeholderName = "Unnamed Room";
+        if (defaultName && defaultName !== 'Empty room') {
+            this._placeholderName += " (" + defaultName + ")";
+        }
+    },
+
+    getRoomName: function() {
+        return this.refs.editor.getValue();
+    },
+
+    render: function() {
+        var EditableText = sdk.getComponent("elements.EditableText");
+
+        return (
+                <div className="mx_RoomHeader_name">
+                    <EditableText ref="editor"
+                         className="mx_RoomHeader_nametext mx_RoomHeader_editable"
+                         placeholderClassName="mx_RoomHeader_placeholder"
+                         placeholder={ this._placeholderName }
+                         blurToCancel={ false }
+                         initialValue={ this._initialName }/>
+                </div>
+        );
+    },
+});
+
diff --git a/src/components/views/rooms/RoomTopicEditor.js b/src/components/views/rooms/RoomTopicEditor.js
new file mode 100644
index 0000000000..ea4550641b
--- /dev/null
+++ b/src/components/views/rooms/RoomTopicEditor.js
@@ -0,0 +1,51 @@
+/*
+Copyright 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.
+*/
+
+'use strict';
+
+var React = require('react');
+var sdk = require('../../../index');
+
+module.exports = React.createClass({
+    displayName: 'RoomTopicEditor',
+
+    propTypes: {
+        room: React.PropTypes.object.isRequired,
+    },
+
+    componentWillMount: function() {
+        var room = this.props.room;
+        var topic = room.currentState.getStateEvents('m.room.topic', '');
+        this._initialTopic = topic ? topic.getContent().topic : '';
+    },
+
+    getTopic: function() {
+        return this.refs.editor.getValue();
+    },
+
+    render: function() {
+        var EditableText = sdk.getComponent("elements.EditableText");
+
+        return (
+                <EditableText ref="editor"
+                     className="mx_RoomHeader_topic mx_RoomHeader_editable"
+                     placeholderClassName="mx_RoomHeader_placeholder"
+                     placeholder="Add a topic"
+                     blurToCancel={ false }
+                     initialValue={ this._initialTopic }/>
+        );
+    },
+});
diff --git a/src/components/views/rooms/SimpleRoomHeader.js b/src/components/views/rooms/SimpleRoomHeader.js
new file mode 100644
index 0000000000..8388da4a71
--- /dev/null
+++ b/src/components/views/rooms/SimpleRoomHeader.js
@@ -0,0 +1,44 @@
+/*
+Copyright 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.
+*/
+
+'use strict';
+
+var React = require('react');
+
+/*
+ * A stripped-down room header used for things like the user settings
+ * and room directory.
+ */
+module.exports = React.createClass({
+    displayName: 'SimpleRoomHeader',
+
+    propTypes: {
+        title: React.PropTypes.string,
+    },
+
+    render: function() {
+        return (
+            <div className="mx_RoomHeader" >
+                <div className="mx_RoomHeader_wrapper">
+                    <div className="mx_RoomHeader_simpleHeader">
+                        { this.props.title }
+                    </div>
+                </div>
+            </div>
+        );
+    },
+});
+