diff --git a/js/dom-functions.js b/js/dom-functions.js
index c1b2a42..c0b0891 100644
--- a/js/dom-functions.js
+++ b/js/dom-functions.js
@@ -1588,7 +1588,7 @@ function addToFeed(feed, after, extraClasses) {
 															</small>\
 														</div>\
 														<div class="small-grey-notice">\
-															<a data-tooltip="' + parseTwitterLongDate(obj.notice.created_at) + '" href="' + window.siteInstanceURL + 'notice/' + obj.notice.id + '">\
+															<a data-created-at="' + obj.notice.created_at + '" data-tooltip="' + parseTwitterLongDate(obj.notice.created_at) + '" href="' + window.siteInstanceURL + 'notice/' + obj.notice.id + '">\
 																' + noticeTime + '\
 															</a>: \
 															' + $.trim(obj.notice.statusnet_html) + '\
@@ -1617,7 +1617,7 @@ function addToFeed(feed, after, extraClasses) {
 															</small>\
 														</div>\
 														<div class="small-grey-notice">\
-															<a data-tooltip="' + parseTwitterLongDate(obj.notice.created_at) + '" href="' + window.siteInstanceURL + 'notice/' + obj.notice.id + '">\
+															<a data-created-at="' + obj.notice.created_at + '" data-tooltip="' + parseTwitterLongDate(obj.notice.created_at) + '" href="' + window.siteInstanceURL + 'notice/' + obj.notice.id + '">\
 																' + noticeTime + '\
 															</a>: \
 															' + $.trim(obj.notice.statusnet_html) + '\
diff --git a/js/qvitter.js b/js/qvitter.js
index 588985d..8ca6549 100644
--- a/js/qvitter.js
+++ b/js/qvitter.js
@@ -1661,8 +1661,15 @@ $(window).scroll(function() {
    · · · · · · · · · · · · · */
 
 var updateTimesInterval=self.setInterval(function(){
-	$('.created-at').each(function(){
-		$(this).children('a').html(parseTwitterDate($(this).attr('data-created-at')));
+	$('[data-created-at]').each(function(){
+		// if the element with the data-created-at doesn't have an a-child, we change the html of the element
+		if($(this).children('a').length==0){
+			$(this).html(parseTwitterDate($(this).attr('data-created-at')));
+			}
+		// otherwise the change the child's html
+		else {
+			$(this).children('a').html(parseTwitterDate($(this).attr('data-created-at')));
+			}
 		});
 	},10000);