diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index ec586431be..61ad43e9c4 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -88,6 +88,7 @@ module.exports = React.createClass({
                     <img className="mx_EntityTile_chevron" src="img/member_chevron.png" width="8" height="12"/>
                     <div className="mx_EntityTile_name_hover">{ this.props.name }</div>
                     <PresenceLabel activeAgo={this.props.presenceActiveAgo}
+                        currentlyActive={this.props.presenceCurrentlyActive}
                         presenceState={this.props.presenceState} />
                 </div>
             );
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index 89f4e35805..57cb7232d4 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -91,6 +91,7 @@ module.exports = React.createClass({
         
         return (
             <EntityTile {...this.props} presenceActiveAgo={active} presenceState={presenceState}
+                presenceCurrentlyActive={ member.user ? member.user.currentlyActive : false }
                 avatarJsx={av} title={this.getPowerLabel()} onClick={this.onClick}
                 shouldComponentUpdate={this.shouldComponentUpdate.bind(this)}
                 name={name} powerLevel={this.props.member.powerLevel} />
diff --git a/src/components/views/rooms/PresenceLabel.js b/src/components/views/rooms/PresenceLabel.js
index 4ecad5b3df..f3315de80c 100644
--- a/src/components/views/rooms/PresenceLabel.js
+++ b/src/components/views/rooms/PresenceLabel.js
@@ -67,9 +67,10 @@ module.exports = React.createClass({
 
     render: function() {
         if (this.props.activeAgo >= 0) {
+            var ago = this.props.currentlyActive ? "now" : (this.getDuration(this.props.activeAgo) + " ago");
             return (
                 <div className="mx_PresenceLabel">
-                    { this.getPrettyPresence(this.props.presenceState) } { this.getDuration(this.props.activeAgo) } ago
+                    { this.getPrettyPresence(this.props.presenceState) } { ago }
                 </div>
             );
         }
diff --git a/src/components/views/rooms/UserTile.js b/src/components/views/rooms/UserTile.js
index 26b9df7e38..fe7e95a02a 100644
--- a/src/components/views/rooms/UserTile.js
+++ b/src/components/views/rooms/UserTile.js
@@ -49,6 +49,7 @@ module.exports = React.createClass({
 
         return (
             <EntityTile {...this.props} presenceState={user.presence} presenceActiveAgo={active}
+                presenceCurrentlyActive={ user.currentlyActive }
                 name={name} title={user.userId} avatarJsx={avatarJsx} />
         );
     }