diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index b0607210f..49930a925 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -292,10 +292,7 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
 
 	history_editor->setParseHTML(TRUE);
 	history_editor_with_mute->setParseHTML(TRUE);
-	
-	history_editor->setParseHighlights(TRUE);
-	history_editor_with_mute->setParseHighlights(TRUE);
-	
+
 	if (!chat.mMuted)
 	{
 		add_timestamped_line(history_editor, chat, color);
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 10cfd7a26..97d9cb4dc 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -553,7 +553,6 @@ BOOL LLFloaterIMPanel::postBuild()
 
 		mHistoryEditor = getChild<LLViewerTextEditor>("im_history");
 		mHistoryEditor->setParseHTML(TRUE);
-		mHistoryEditor->setParseHighlights(TRUE);
 
 		sTitleString = getString("title_string");
 		sTypingStartString = getString("typing_start_string");
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 75ead67ca..03f6f94b6 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -272,6 +272,7 @@ BOOL LLScriptEdCore::postBuild()
 
 	mEditor = getChild<LLViewerTextEditor>("Script Editor");
 	mEditor->setHandleEditKeysDirectly(TRUE);
+	mEditor->setParseHighlights(TRUE);
 
 	childSetCommitCallback("lsl errors", &LLScriptEdCore::onErrorList, this);
 	childSetAction("Save_btn", boost::bind(&LLScriptEdCore::doSave,this,FALSE));
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 01d2014d2..7a6c7294c 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -1461,7 +1461,6 @@ LLView* LLViewerTextEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlF
 	BOOL parse_html = true;
 	node->getAttributeBOOL("allow_html", parse_html);
 	text_editor->setParseHTML(parse_html);
-	text_editor->setParseHighlights(TRUE);
 
 	BOOL commit_on_focus_lost = FALSE;
 	node->getAttributeBOOL("commit_on_focus_lost",commit_on_focus_lost);