diff --git a/lib/util.php b/lib/util.php
index cc294b8f28..8eeda11156 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -936,9 +936,9 @@ function common_at_link($sender_id, $nickname) {
 	$sender = Profile::staticGet($sender_id);
 	$recipient = common_relative_profile($sender, common_canonical_nickname($nickname));
 	if ($recipient) {
-		return '<span class="vcard"><a class="fn nickname url atlink" rel="reply" href="'.htmlspecialchars($recipient->profileurl).'">'.$nickname.'</a></span>';
+		return '<a href="'.htmlspecialchars($recipient->profileurl).'" class="atlink">'.$nickname.'</a>';
 	} else {
-		return '<span class="vcard"><span class="fn nickname">'.$nickname.'</span></span>';
+		return $nickname;
 	}
 }