--- mytwitter.php.orig	2008-01-08 19:30:07.000000000 +0200
+++ mytwitter.php	2008-01-09 14:24:27.000000000 +0200
@@ -141,11 +141,7 @@
 
 function myTwitterFormatter($tweet) {
 	$tweet = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]","<i><a href=\"\\0\">link</a></i>",$tweet); // turn any URL's into links
-	if (substr($tweet, 0, 1) == '@' && substr($tweet, 1, 1) != ' ') {
-		$space = strpos($tweet, ' ');
-		$username = substr($tweet, 1, $space - 1);
-		$tweet = '<a href="http://twitter.com/'.$username.'">@'.$username.'</a>'.substr($tweet, $space);
-	}
+	$tweet = ereg_replace("@([a-zA-Z0-9]+)([^a-zA-Z0-9])",'<a href="http://twitter.com/\\1">@\\1</a>\\2',$tweet); // add "@username" links
 	return $tweet;
 }