diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 56b7520bd5e3f4bdccb674cbec97610f508087cb..8a6935b71bf91d9b9767c6540de1d099c2221d5d 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -187,7 +187,7 @@ void LLNearbyChatToastPanel::init(LLSD& notification)
 			msg_text->setText(mFromName, style_params);
 		}
 		mText = mText.substr(3);
-		style_params.font.style = "UNDERLINE";
+		style_params.font.style = "ITALIC";
 #define INFINITE_REFLOW_BUG 0
 #if INFINITE_REFLOW_BUG
 		// This causes LLTextBase::reflow() to infinite loop until the viewer
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index c2c83191e003d7ace33baacdae891102a3d2111b..120935883adf65df06c4b51b22b84f58d47baaec 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -494,12 +494,12 @@ void LLIMFloater::updateMessages()
 				if (from.size() > 0)
 				{
 					append_style_params.font.style = "ITALIC";
-					chat.mText = from + " ";
+					chat.mText = from;
 					mChatHistory->appendWidgetMessage(chat, append_style_params);
 				}
 				
 				message = message.substr(3);
-				append_style_params.font.style = "UNDERLINE";
+				append_style_params.font.style = "ITALIC";
 				mChatHistory->appendText(message, FALSE, append_style_params);
 			}
 			else
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 16a47890c3ba878facfbba1b3d1e368735f3dab2..1f984e3af87cd6a2a6137e19a04bd2c5fee8c67b 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -177,7 +177,7 @@ void	LLNearbyChat::addMessage(const LLChat& chat)
 			}
 			
 			message = message.substr(3);
-			append_style_params.font.style = "UNDERLINE";
+			append_style_params.font.style = "ITALIC";
 			mChatHistory->appendText(message, FALSE, append_style_params);
 		}
 		else
diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp
index d2cc6d07260bbaba566cffbdd44f270c2dd40866..9040bdb41ab41f9c75fc9c7ac6cf5090340e46c6 100644
--- a/indra/newview/lltoastimpanel.cpp
+++ b/indra/newview/lltoastimpanel.cpp
@@ -64,7 +64,7 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) :	LLToastPanel(p.notif
 		style_params.font.style ="ITALIC";
 		mMessage->appendText(p.from + " ", FALSE, style_params);
 
-		style_params.font.style = "UNDERLINE";
+		style_params.font.style = "ITALIC";
 		mMessage->appendText(p.message.substr(3), FALSE, style_params);
 	}
 	else