diff --git a/e107_files/bbcode/link.bb b/e107_files/bbcode/link.bb
index aeca5ace6..da633bcf9 100644
--- a/e107_files/bbcode/link.bb
+++ b/e107_files/bbcode/link.bb
@@ -26,6 +26,7 @@ global $pref;
 	{
 		list($pre,$email) = explode(":",$parm);
 		list($p1,$p2) = explode("@",$email);
+		$p2=rawurlencode($p2);			// Primarily to pick up spaces, which are not allowed
 		return "<a class='bbcode' rel='external' href='javascript:window.location=\"mai\"+\"lto:\"+\"$p1\"+\"@\"+\"$p2\";self.close();' onmouseover='window.status=\"mai\"+\"lto:\"+\"$p1\"+\"@\"+\"$p2\"; return true;' onmouseout='window.status=\"\";return true;'>".$code_text."</a>";
 	}