diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index 807081bcd2..82f3337d15 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -33,7 +33,7 @@ module.exports = React.createClass({
 
         var msgtype = mxEvent.getContent().msgtype;
         if (msgtype && msgtype == 'm.emote') {
-            name = ''; // emote message must include the name so don't duplicate it
+            return <span/>; // emote message must include the name so don't duplicate it
         }
         return (
             <span className="mx_SenderProfile" onClick={this.props.onClick}>
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
index 821cc8d370..f28b576fc8 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
@@ -39,10 +39,10 @@ limitations under the License.
 .mx_EventTile .mx_SenderProfile {
     color: #454545;
     opacity: 0.5;
+    display: inline-block;
     font-size: 13px;
     overflow-y: hidden;
     cursor: pointer;
-    vertical-align: text-top;
 }
 
 .mx_EventTile .mx_MessageTimestamp {