diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 6f2d8f038b..31ef15b6dc 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -346,6 +346,7 @@ module.exports = React.createClass({
             continuation = true;
         }
 
+/*
         // Work out if this is still a continuation, as we are now showing commands
         // and /me messages with their own little avatar. The case of a change of
         // event type (commands) is handled above, but we need to handle the /me
@@ -357,6 +358,7 @@ module.exports = React.createClass({
                 && prevEvent.getContent().msgtype === 'm.emote') {
             continuation = false;
         }
+*/
 
         // local echoes have a fake date, which could even be yesterday. Treat them
         // as 'today' for the date separators.
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index f3ae3dff7f..b11f9b1291 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -375,7 +375,7 @@ module.exports = React.createClass({
 
         // Info messages are basically information about commands processed on a
         // room, or emote messages
-        var isInfoMessage = (msgtype === 'm.emote' || eventType !== 'm.room.message');
+        var isInfoMessage = false; // (msgtype === 'm.emote' || eventType !== 'm.room.message');
 
         var EventTileType = sdk.getComponent(eventTileTypes[eventType]);
         // This shouldn't happen: the caller should check we support this type
@@ -422,7 +422,7 @@ module.exports = React.createClass({
             needsSenderProfile = false;
         } else {
             avatarSize = 30;
-            needsSenderProfile = true;
+            needsSenderProfile = (eventType === 'm.room.message');
         }
 
         if (this.props.mxEvent.sender && avatarSize) {