diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 3a32ec0b88..faa3686769 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -2150,7 +2150,11 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
 			// </FS:Ansariel> Optional icon position
 
 			// output the styled Url
-			appendAndHighlightTextImpl(match.getLabel(), part, link_params, match.underlineOnHoverOnly());
+			// <FS:CR> FIRE-11437 - Don't supress font style for chat history name links
+			//appendAndHighlightTextImpl(match.getLabel(), part, link_params, match.underlineOnHoverOnly());
+			appendAndHighlightTextImpl(match.getLabel(), part, link_params,
+									   input_params.is_name_slurl ? false : match.underlineOnHoverOnly());
+			// </FS:CR>
 			
 			// set the tooltip for the Url label
 			if (! match.getTooltip().empty())
diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp
index a16713c1b3..968761fcb5 100644
--- a/indra/newview/fschathistory.cpp
+++ b/indra/newview/fschathistory.cpp
@@ -1034,8 +1034,8 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 // [/RLVa:KB]
 			{
 				LLStyle::Params link_params(body_message_params);
-				link_params.overwriteFrom(LLStyleMap::instance().lookupAgent(chat.mFromID));
 				link_params.is_name_slurl = true;
+				link_params.link_href = LLSLURL("agent", chat.mFromID, "inspect").getSLURLString();
 				link_params.color = name_color;
 				link_params.readonly_color = name_color;
 
diff --git a/indra/newview/llstylemap.cpp b/indra/newview/llstylemap.cpp
index 27b41334e0..43fe37ac77 100755
--- a/indra/newview/llstylemap.cpp
+++ b/indra/newview/llstylemap.cpp
@@ -42,9 +42,8 @@ const LLStyle::Params &LLStyleMap::lookupAgent(const LLUUID &source)
 		LLStyle::Params style_params;
 		if (source != LLUUID::null)
 		{
-			// <FS:CR> FIRE-11330 - Let chat history decide
-			//style_params.color.control = "HTMLLinkColor";
-			//style_params.readonly_color.control = "HTMLLinkColor";
+			style_params.color.control = "HTMLLinkColor";
+			style_params.readonly_color.control = "HTMLLinkColor";
 			style_params.link_href = LLSLURL("agent", source, "inspect").getSLURLString();
 		}
 		mMap[source] = style_params;