diff --git a/skins/base/css/molecules/MessageTile.css b/skins/base/css/molecules/MessageTile.css
index 45882de6dc..50a12c3a59 100644
--- a/skins/base/css/molecules/MessageTile.css
+++ b/skins/base/css/molecules/MessageTile.css
@@ -26,7 +26,7 @@ limitations under the License.
     padding-right: 12px;
     margin-left: -64px;
     margin-top: -7px;
-    float: left;    
+    float: left;
 }
 
 .mx_MessageTile_avatar img {
@@ -78,3 +78,15 @@ limitations under the License.
 .mx_MessageTile_msgOption {
     float: right;
 }
+
+.mx_MessageTimestamp {
+    display: none;
+}
+
+.mx_MessageTile_last .mx_MessageTimestamp {
+    display: block;
+}
+
+.mx_MessageTile:hover .mx_MessageTimestamp {
+    display: block;
+}
diff --git a/skins/base/views/molecules/MessageTile.js b/skins/base/views/molecules/MessageTile.js
index 1590179192..d868b143a5 100644
--- a/skins/base/views/molecules/MessageTile.js
+++ b/skins/base/views/molecules/MessageTile.js
@@ -57,8 +57,9 @@ module.exports = React.createClass({
             mx_MessageTile_notSent: this.props.mxEvent.status == 'not_sent',
             mx_MessageTile_highlight: this.shouldHighlight(),
             mx_MessageTile_continuation: this.props.continuation,
+            mx_MessageTile_last: this.props.last
         });
-        var timestamp = this.props.last ? <MessageTimestamp ts={this.props.mxEvent.getTs()} /> : null;
+        var timestamp = <MessageTimestamp ts={this.props.mxEvent.getTs()} />
         var avatar, sender, resend;
         if (!this.props.continuation) {
             avatar = (
@@ -84,4 +85,3 @@ module.exports = React.createClass({
         );
     },
 });
-