From 01c2155563721754234a50eb068f8e68046a754f Mon Sep 17 00:00:00 2001
From: Matt Mullenweg <matt@git.wordpress.org>
Date: Wed, 16 Nov 2005 23:44:03 +0000
Subject: [PATCH] Better email links, fixes #1416

git-svn-id: https://develop.svn.wordpress.org/trunk@3114 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/functions-formatting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/functions-formatting.php b/wp-includes/functions-formatting.php
index f73382fc33..c95fb23081 100644
--- a/wp-includes/functions-formatting.php
+++ b/wp-includes/functions-formatting.php
@@ -563,7 +563,7 @@ function make_clickable($ret) {
 	$ret = ' ' . $ret . ' ';
 	$ret = preg_replace("#([\s>])(https?)://([^\s<>{}()]+[^\s.,<>{}()])#i", "$1<a href='$2://$3' rel='nofollow'>$2://$3</a>", $ret);
 	$ret = preg_replace("#(\s)www\.([a-z0-9\-]+)\.([a-z0-9\-.\~]+)((?:/[^ <>{}()\n\r]*[^., <>{}()\n\r]?)?)#i", "$1<a href='http://www.$2.$3$4' rel='nofollow'>www.$2.$3$4</a>", $ret);
-	$ret = preg_replace("#(\s)([a-z0-9\-_.]+)@([^,< \n\r]+)#i", "$1<a href=\"mailto:$2@$3\">$2@$3</a>", $ret);
+	$ret = preg_replace("#(\s)([a-z0-9\-_.]+)@([a-z0-9\-_.]+)\.([^,< \n\r]+)#i", "$1<a href=\"mailto:$2@$3.$4\">$2@$3.$4</a>", $ret);
 	$ret = trim($ret);
 	return $ret;
 }