diff --git a/src/component-index.js b/src/component-index.js
index f10549ce4d..abb1c054d7 100644
--- a/src/component-index.js
+++ b/src/component-index.js
@@ -66,6 +66,7 @@ module.exports.components['views.rooms.RoomHeader'] = require('./components/view
 module.exports.components['views.rooms.RoomList'] = require('./components/views/rooms/RoomList');
 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.SearchResultTile'] = require('./components/views/rooms/SearchResultTile');
 module.exports.components['views.rooms.TabCompleteBar'] = require('./components/views/rooms/TabCompleteBar');
 module.exports.components['views.settings.ChangeAvatar'] = require('./components/views/settings/ChangeAvatar');
 module.exports.components['views.settings.ChangeDisplayName'] = require('./components/views/settings/ChangeDisplayName');
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index ad30f25b22..5f1ce2284d 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -574,8 +574,8 @@ module.exports = React.createClass({
 
 
     getSearchResultTiles: function() {
-        var DateSeparator = sdk.getComponent('messages.DateSeparator');
         var EventTile = sdk.getComponent('rooms.EventTile');
+        var SearchResultTile = sdk.getComponent('rooms.SearchResultTile');
         var cli = MatrixClientPeg.get();
 
         // XXX: todo: merge overlapping results somehow?
@@ -615,33 +615,27 @@ module.exports = React.createClass({
                 continue;
             }
 
-            var eventId = mxEv.getId();
-
             if (this.state.searchScope === 'All') {
                 var roomId = mxEv.getRoomId();
                 if(roomId != lastRoomId) {
-                    ret.push(<li key={eventId + "-room"}><h1>Room: { cli.getRoom(roomId).name }</h1></li>);
+                    var room = cli.getRoom(roomId);
+
+                    // XXX: if we've left the room, we might not know about
+                    // it. We should tell the js sdk to go and find out about
+                    // it. But that's not an issue currently, as synapse only
+                    // returns results for rooms we're joined to.
+                    var roomName = room ? room.name : "Unknown room "+roomId;
+
+                    ret.push(<li key={mxEv.getId() + "-room"}>
+                                 <h1>Room: { roomName }</h1>
+                             </li>);
                     lastRoomId = roomId;
                 }
             }
 
-            var ts1 = mxEv.getTs();
-            ret.push(<li key={ts1 + "-search"}><DateSeparator ts={ts1}/></li>); // Rank: {resultList[i].rank}
-
-            var timeline = result.context.getTimeline();
-            for (var j = 0; j < timeline.length; j++) {
-                var ev = timeline[j];
-                var highlights;
-                var contextual = (j != result.context.getOurEventIndex());
-                if (!contextual) {
-                    highlights = this.state.searchHighlights;
-                }
-                if (EventTile.haveTileForEvent(ev)) {
-                    ret.push(<li key={eventId+"+"+j} data-scroll-token={eventId+"+"+j}>
-                             <EventTile mxEvent={ev} contextual={contextual} highlights={highlights} />
-                             </li>);
-                }
-            }
+            ret.push(<SearchResultTile key={mxEv.getId()}
+                     searchResult={result}
+                     searchHighlights={this.state.searchHighlights}/>);
         }
         return ret;
     },
diff --git a/src/components/views/rooms/SearchResultTile.js b/src/components/views/rooms/SearchResultTile.js
new file mode 100644
index 0000000000..9d3af16ee7
--- /dev/null
+++ b/src/components/views/rooms/SearchResultTile.js
@@ -0,0 +1,64 @@
+/*
+Copyright 2015 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: 'SearchResult',
+
+    propTypes: {
+        // a matrix-js-sdk SearchResult containing the details of this result
+        searchResult: React.PropTypes.object.isRequired,
+
+        // a list of strings to be highlighted in the results
+        searchHighlights: React.PropTypes.array,
+
+        // callback to be called when the user selects this result
+        onSelect: React.PropTypes.func,
+    },
+
+    render: function() {
+        var DateSeparator = sdk.getComponent('messages.DateSeparator');
+        var EventTile = sdk.getComponent('rooms.EventTile');
+        var result = this.props.searchResult;
+        var mxEv = result.context.getEvent();
+        var eventId = mxEv.getId();
+
+        var ts1 = mxEv.getTs();
+        var ret = [<DateSeparator key={ts1 + "-search"} ts={ts1}/>];
+
+        var timeline = result.context.getTimeline();
+        for (var j = 0; j < timeline.length; j++) {
+            var ev = timeline[j];
+            var highlights;
+            var contextual = (j != result.context.getOurEventIndex());
+            if (!contextual) {
+                highlights = this.props.searchHighlights;
+            }
+            if (EventTile.haveTileForEvent(ev)) {
+                ret.push(<EventTile key={eventId+"+"+j} mxEvent={ev} contextual={contextual} highlights={highlights}
+                         onHighlightClick={this.props.onSelect}/>)
+            }
+        }
+        return (
+            <li data-scroll-token={eventId+"+"+j}>
+                {ret}
+            </li>);
+    },
+});