 -		return $text;
 +	return wordwrap($text, 72);
  }
-
-
+ 
+ 
 diff --git a/include/parser.php b/include/parser.php
-index 5d564d2..fde6e8b 100644
+index b7eb4bd..a98356c 100644
 --- a/include/parser.php
 +++ b/include/parser.php
 @@ -64,6 +64,7 @@ $smilies = array(

diff --git a/include/email.php b/include/email.php
index 88c62a8..e4dc5d1 100644
--- a/include/email.php
+++ b/include/email.php
@@ -60,149 +60,7 @@ function encode_mail_text($str)
 //
 function bbcode2email($text, $wrap_length = 72)
 {

-	global $pun_config, $lang_common, $pun_user;
+	global $pun_config, $cur_post;
+	static $textile = null;
 
 	if ($pun_config['o_censoring'] == '1')
+	{
 		$text = censor_words($text);
+	}
 
-	// Convert applicable characters to HTML entities
-	$text = pun_htmlspecialchars($text);
-
