diff --git a/include/conversation.php b/include/conversation.php
index 37856651e1..6283cfe0ae 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -166,6 +166,12 @@ function localize_item(&$item){
 			}
 		}
 	}
+	$matches = null;
+	if(preg_match_all('/@[url=(.*?)]/is',$item['body'],$matches,PREG_SET_ORDER)) {
+		foreach($matches as $mtch) {
+			$item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
+		}
+	}
 
 }