diff --git a/Changelog.md b/Changelog.md
index 2b0562179..1b71914dd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -18,6 +18,7 @@
 * Deleting a post that was shared to Facebook now deletes it from Facebook too [#3980]( https://github.com/diaspora/diaspora/pull/3980)
 * Include reshares in a users public atom feed [#1781](https://github.com/diaspora/diaspora/issues/1781)
 * Add the ability to upload photos from the mobile site. [#4004](https://github.com/diaspora/diaspora/issues/4004)
+* Show timestamp when hovering on comment time-ago string. [#4042](https://github.com/diaspora/diaspora/issues/4042)
 
 # 0.0.3.2
 
diff --git a/app/assets/templates/comment_tpl.jst.hbs b/app/assets/templates/comment_tpl.jst.hbs
index 6d4b3cca3..9737a33e2 100644
--- a/app/assets/templates/comment_tpl.jst.hbs
+++ b/app/assets/templates/comment_tpl.jst.hbs
@@ -22,6 +22,6 @@
   </div>
 
   <div class="info">
-    <time class="timeago" datetime="{{created_at}}"/>
+    <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}"/>
   </div>
 </div>
diff --git a/app/assets/templates/post-viewer/comment_tpl.jst.hbs b/app/assets/templates/post-viewer/comment_tpl.jst.hbs
index 02df70245..d88019e73 100644
--- a/app/assets/templates/post-viewer/comment_tpl.jst.hbs
+++ b/app/assets/templates/post-viewer/comment_tpl.jst.hbs
@@ -22,6 +22,6 @@
     </div>
 
     <div class="info">
-        <time class="timeago" datetime="{{created_at}}"/>
+        <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}"/>
     </div>
 </div>