diff --git a/src/controllers/organisms/RoomView.js b/src/controllers/organisms/RoomView.js
index 40564e5588..b091a872e8 100644
--- a/src/controllers/organisms/RoomView.js
+++ b/src/controllers/organisms/RoomView.js
@@ -455,6 +455,7 @@ module.exports = {
                         event_context: {
                             before_limit: 1,
                             after_limit: 1,
+                            include_profile: true,
                         }
                     }
                 }
@@ -499,7 +500,7 @@ module.exports = {
         var ret = [];
         var count = 0;
 
-        var EventTile = sdk.getComponent('messages.Event');
+        var EventTile = sdk.getComponent('rooms.EventTile');
         var self = this;
 
         if (this.state.searchResults &&
diff --git a/src/skins/vector/skindex.js b/src/skins/vector/skindex.js
index 1e747c62da..3670c4f0dc 100644
--- a/src/skins/vector/skindex.js
+++ b/src/skins/vector/skindex.js
@@ -42,21 +42,20 @@ skin['elements.EditableText'] = require('matrix-react-sdk/lib/components/views/e
 skin['elements.ProgressBar'] = require('matrix-react-sdk/lib/components/views/elements/ProgressBar');
 skin['elements.UserSelector'] = require('matrix-react-sdk/lib/components/views/elements/UserSelector');
 
-skin['messages.MessageComposer'] = require('matrix-react-sdk/lib/components/views/messages/MessageComposer');
 skin['messages.TextualEvent'] = require('matrix-react-sdk/lib/components/views/messages/TextualEvent');
-skin['messages.MRoomMemberEvent'] = require('matrix-react-sdk/lib/components/views/messages/MRoomMemberEvent');
-skin['messages.Event'] = require('matrix-react-sdk/lib/components/views/messages/Event');
-skin['messages.Message'] = require('matrix-react-sdk/lib/components/views/messages/Message');
-skin['messages.MFileMessage'] = require('matrix-react-sdk/lib/components/views/messages/MFileMessage');
-skin['messages.MImageMessage'] = require('matrix-react-sdk/lib/components/views/messages/MImageMessage');
-skin['messages.MVideoMessage'] = require('matrix-react-sdk/lib/components/views/messages/MVideoMessage');
-skin['messages.TextualMessage'] = require('matrix-react-sdk/lib/components/views/messages/TextualMessage');
-skin['messages.UnknownMessage'] = require('matrix-react-sdk/lib/components/views/messages/UnknownMessage');
+skin['messages.MessageEvent'] = require('matrix-react-sdk/lib/components/views/messages/MessageEvent');
+skin['messages.MFileBody'] = require('matrix-react-sdk/lib/components/views/messages/MFileBody');
+skin['messages.MImageBody'] = require('matrix-react-sdk/lib/components/views/messages/MImageBody');
+skin['messages.MVideoBody'] = require('matrix-react-sdk/lib/components/views/messages/MVideoBody');
+skin['messages.TextualBody'] = require('matrix-react-sdk/lib/components/views/messages/TextualBody');
+skin['messages.UnknownBody'] = require('matrix-react-sdk/lib/components/views/messages/UnknownBody');
 
 skin['rooms.MemberInfo'] = require('matrix-react-sdk/lib/components/views/rooms/MemberInfo');
 skin['rooms.RoomHeader'] = require('matrix-react-sdk/lib/components/views/rooms/RoomHeader');
 skin['rooms.RoomSettings'] = require('matrix-react-sdk/lib/components/views/rooms/RoomSettings');
 skin['rooms.MemberTile'] = require('matrix-react-sdk/lib/components/views/rooms/MemberTile');
+skin['rooms.MessageComposer'] = require('matrix-react-sdk/lib/components/views/rooms/MessageComposer');
+skin['rooms.EventTile'] = require('matrix-react-sdk/lib/components/views/rooms/EventTile');
 
 skin['create_room.CreateRoomButton'] = require('matrix-react-sdk/lib/components/views/create_room/CreateRoomButton');
 skin['create_room.Presets'] = require('matrix-react-sdk/lib/components/views/create_room/Presets');
diff --git a/src/skins/vector/views/organisms/RoomView.js b/src/skins/vector/views/organisms/RoomView.js
index a34d321eea..1d55c98023 100644
--- a/src/skins/vector/views/organisms/RoomView.js
+++ b/src/skins/vector/views/organisms/RoomView.js
@@ -109,7 +109,7 @@ module.exports = React.createClass({
 
     render: function() {
         var RoomHeader = sdk.getComponent('rooms.RoomHeader');
-        var MessageComposer = sdk.getComponent('messages.MessageComposer');
+        var MessageComposer = sdk.getComponent('rooms.MessageComposer');
         var CallView = sdk.getComponent("voip.CallView");
         var RoomSettings = sdk.getComponent("rooms.RoomSettings");
         var SearchBar = sdk.getComponent("molecules.SearchBar");