diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 8641dfa24..3a3aec447 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2007-03-26 06:34:56 $
-|     $Author: e107coders $
+|     $Revision: 1.9 $
+|     $Date: 2007-04-30 20:16:55 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -63,32 +63,42 @@ class e_parse
 		// Second line changes default-OFF options
 	var	$e_SuperMods = array(
 				'title' =>				//text is part of a title (e.g. news title)
-					array( 
-						'nobreak'=>TRUE, 'retain_nl'=>TRUE, 'no_make_clickable'=>TRUE,'emotes_off'=>TRUE,'no_hook'=>TRUE,
+					array(
+						'nobreak'=>TRUE, 'retain_nl'=>TRUE, 'no_make_clickable'=>TRUE,'emotes_off'=>TRUE,
 						'defs'=>TRUE,'parse_sc'=>TRUE),
 
+				'user_title' =>				//text is user-entered (i.e. untrusted) and part of a title (e.g. forum title)
+					array(
+						'nobreak'=>TRUE, 'retain_nl'=>TRUE, 'no_make_clickable'=>TRUE,'emotes_off'=>TRUE,'no_hook'=>TRUE
+						),
+
 				'summary' =>			// text is part of the summary of a longer item (e.g. content summary)
-					array( 
+					array(
 						// no changes to default-on items
 						'defs'=>TRUE, 'constants'=>TRUE, 'parse_sc'=>TRUE),
 
 				'description' =>	// text is the description of an item (e.g. download, link)
-					array( 
+					array(
 						// no changes to default-on items
 						'defs'=>TRUE, 'constants'=>TRUE, 'parse_sc'=>TRUE),
 
 				'body' =>					// text is 'body' or 'bulk' text (e.g. custom page body, content body)
-					array( 
+					array(
 						// no changes to default-on items
 						'defs'=>TRUE, 'constants'=>TRUE, 'parse_sc'=>TRUE),
 
+				'user_body' =>					// text is user-entered (i.e. untrusted)'body' or 'bulk' text (e.g. custom page body, content body)
+					array(
+						// no changes to default-on items
+						),
+
 				'linktext' =>			// text is the 'content' of a link (A tag, etc)
-					array( 
+					array(
 						'nobreak'=>TRUE, 'retain_nl'=>TRUE, 'no_make_clickable'=>TRUE,'emotes_off'=>TRUE,'no_hook'=>TRUE,
 						'defs'=>TRUE,'parse_sc'=>TRUE),
 
 				'rawtext' =>			// text is used (for admin edit) without fancy conversions
-					array( 
+					array(
 						'nobreak'=>TRUE, 'retain_nl'=>TRUE, 'no_make_clickable'=>TRUE,'emotes_off'=>TRUE,'no_hook'=>TRUE,
 						// leave opt-in options off
 						)
diff --git a/e107_plugins/chatbox_menu/chat.php b/e107_plugins/chatbox_menu/chat.php
index 89ea26d1f..db38eed98 100644
--- a/e107_plugins/chatbox_menu/chat.php
+++ b/e107_plugins/chatbox_menu/chat.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/chatbox_menu/chat.php,v $
-|     $Revision: 1.6 $
-|     $Date: 2007-01-28 13:51:45 $
+|     $Revision: 1.7 $
+|     $Date: 2007-04-30 20:17:05 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -111,7 +111,7 @@ foreach ($chatList as $row)
 {
 	$CHAT_TABLE_DATESTAMP = $obj2->convert_date($row['cb_datestamp'], "long");
 	$CHAT_TABLE_NICK = preg_replace("/[0-9]+\./", "", $row['cb_nick']);
-	$cb_message = $tp->toHTML($row['cb_message'], TRUE,'BODY');
+	$cb_message = $tp->toHTML($row['cb_message'], TRUE,'USER_BODY');
 	if($row['cb_blocked'])
 	{
 		$cb_message .= "<br />".CHATBOX_L25;
diff --git a/e107_plugins/chatbox_menu/chatbox_menu.php b/e107_plugins/chatbox_menu/chatbox_menu.php
index 75f6bf301..8a5adba5f 100644
--- a/e107_plugins/chatbox_menu/chatbox_menu.php
+++ b/e107_plugins/chatbox_menu/chatbox_menu.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/chatbox_menu/chatbox_menu.php,v $
-|     $Revision: 1.6 $
-|     $Date: 2007-01-28 14:08:25 $
+|     $Revision: 1.7 $
+|     $Date: 2007-04-30 20:17:05 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -190,13 +190,13 @@ if(!$text = $e107cache->retrieve("nq_chatbox"))
 			}
 			else
 			{
-				$cb_nick = $tp -> toHTML($cb_nick,FALSE,'emotes_off, no_make_clickable');
+				$cb_nick = $tp -> toHTML($cb_nick,FALSE,'USER_TITLE, emotes_off, no_make_clickable');
 				$cb_nick = str_replace("Anonymous", LAN_ANONYMOUS, $cb_nick);
 			}
 
 			$datestamp = $obj2->convert_date($cb['cb_datestamp'], "short");
 			if(!$pref['cb_wordwrap']) { $pref['cb_wordwrap'] = 30; }
-			$emotes_active = $pref['cb_emote'] ? 'BODY, emotes_on' : 'BODY, emotes_off';
+			$emotes_active = $pref['cb_emote'] ? 'USER_BODY, emotes_on' : 'USER_BODY, emotes_off';
 
 			$cb_message = $tp -> toHTML($cb['cb_message'], FALSE, $emotes_active, $cb_uid, $pref['menu_wordwrap']);
 
diff --git a/e107_plugins/forum/forum_shortcodes.php b/e107_plugins/forum/forum_shortcodes.php
index 3a4c34848..94f9e6ab2 100644
--- a/e107_plugins/forum/forum_shortcodes.php
+++ b/e107_plugins/forum/forum_shortcodes.php
@@ -22,7 +22,7 @@ SC_END
 SC_BEGIN POST
 global $post_info, $tp, $iphost;
 $ret = "";
-$ret = $tp->toHTML($post_info["thread_thread"], TRUE, "BODY", 'class:'.$post_info["user_class"]);
+$ret = $tp->toHTML($post_info["thread_thread"], TRUE, "USER_BODY", 'class:'.$post_info["user_class"]);
 if (ADMIN && $iphost) {
 $ret .= "<br />".$iphost;
 }