diff --git a/e107_files/bbcode/email.bb b/e107_files/bbcode/email.bb
index bb54cce6e..bfbcefd19 100644
--- a/e107_files/bbcode/email.bb
+++ b/e107_files/bbcode/email.bb
@@ -12,8 +12,10 @@ if($pref['make_clickable'])
 	}
 	else
 	{
-		list($p1,$p2) = explode("@",$code_text);
-		$email_text = (CHARSET != "utf-8" && CHARSET != "UTF-8") ? $p1."©".$p2 : $p1."©".$p2;
+		list($p1, $p2) = explode("@", $code_text);
+		
+		// CHARSET is utf-8 - email.bb too
+		$email_text = $p1.'©'.$p2;
 		return "<a 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;'>".$email_text."</a>";
 	}
 }
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 2231b8c36..0d7b645b1 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -9,8 +9,8 @@
 * Text processing and parsing functions
 *
 * $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
-* $Revision: 1.82 $
-* $Date: 2009-11-17 09:11:05 $
+* $Revision: 1.83 $
+* $Date: 2009-11-17 11:00:40 $
 * $Author: marj_nl_fr $
 *
 */
@@ -1211,7 +1211,10 @@ class e_parse
 							}
 							else
 							{
-								$email_text = ($this->isutf8) ? "\\1\\2©\\3" : "\\1\\2&copy;\\3";
+								// CHARSET is utf-8 - e_parse_class.php too
+								//$email_text = ($this->isutf8) ? "\\1\\2©\\3" : "\\1\\2&copy;\\3";
+								$email_text = '$1$2©$3';
+								
 								$sub_blk = preg_replace("#(^|[\s])([\w]+?://(?:[\w-%]+?)(?:\.[\w-%]+?)+.*?)(?=$|[\s()[\]<]|\.\s|\.$|,\s|,$)#is", "\\1<a href=\"\\2\" rel=\"external\">\\2</a>", $sub_blk);
 								$sub_blk = preg_replace("#(^|[\s])((?:www|ftp)(?:\.[\w-%]+?){2}.*?)(?=$|[\s()[\]<]|\.\s|\.$|,\s|,$)#is", "\\1<a href=\"http://\\2\" rel=\"external\">\\2</a>", $sub_blk);
 								$sub_blk = preg_replace("#([\n ])([a-z0-9\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a rel='external' href='javascript:window.location=\"mai\"+\"lto:\"+\"\\2\"+\"@\"+\"\\3\";self.close();' onmouseover='window.status=\"mai\"+\"lto:\"+\"\\2\"+\"@\"+\"\\3\"; return true;' onmouseout='window.status=\"\";return true;'>".$email_text."</a>", $sub_blk);