diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 1ef3b6e6c0..b61ff8eabc 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -312,7 +312,9 @@ module.exports = React.createClass({
             mx_EventTile_contextual: this.props.contextual,
             menu: this.state.menu,
         });
-        var timestamp = <MessageTimestamp ts={this.props.mxEvent.getTs()} />
+        var timestamp = <a href={ "#/room/" + this.props.mxEvent.getRoomId() +"/"+ this.props.mxEvent.getId() }>
+                            <MessageTimestamp ts={this.props.mxEvent.getTs()} />
+                        </a>
 
         var aux = null;
         if (msgtype === 'm.image') aux = "sent an image";