diff --git a/lib/util.php b/lib/util.php
index 7a0d5d11f1..54a30a914d 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -349,12 +349,10 @@ function common_canonical_email($email) {
 	return $email;
 }
 
-function common_render_content($text, $notice=NULL) {
+function common_render_content($text, $notice) {
 	$r = htmlspecialchars($text);
-	if ($notice) {
-		$id = $notice->profile_id;
-		$r = preg_replace('/\b@([\w-]+)\b/e', "ATLINK*** \\1 ***", $r);
-	}
+	$id = $notice->profile_id;
+	$r = preg_replace('/\b@([\w-]+)\b/e', "@common_at_link($id,'\\1')", $r);
 	# XXX: # tags
 	# XXX: machine tags
 	return $r;