diff --git a/model/comment.class.php b/model/comment.class.php
index 4261a961bd874238d655f10cc2aad9850e264dbc..6c37987b384c8beba81f9300276c72e03257cb12 100644
--- a/model/comment.class.php
+++ b/model/comment.class.php
@@ -394,7 +394,7 @@ class pdfannotator_comment {
             $comment->content = $content;
             $comment->timemodified = time();
             $comment->modifiedby = $USER->id;
-            $time = pdfannotator_get_user_datetime($comment->timemodified);
+            $time = pdfannotator_optional_timeago($comment->timemodified);
             $success = $DB->update_record('pdfannotator_comments', $comment);
         } else {
             $success = false;
diff --git a/templates/comment.mustache b/templates/comment.mustache
index 78dc81cad68fc13daae3d103c1bc1287f1bc1a8d..57f417eed6780f115ffe4a2780adfeab78305208 100644
--- a/templates/comment.mustache
+++ b/templates/comment.mustache
@@ -67,7 +67,7 @@
                     <em class="edited">
                         {{# edited }}
                             <div>
-                                <span id="timemodified_{{ uuid }}">{{# str }} editedComment, pdfannotator {{/ str }}{{timemodified}}</span>
+                                <span id="timemodified_{{ uuid }}">{{# str }} editedComment, pdfannotator {{/ str }} {{timemodified}}</span>
                                 <span id="modifiedby_{{ uuid }}">{{modifiedby}}</span>
                             </div>
                         {{/ edited }}