diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp
index 5d670155260b91f2b88cae5b9875574dfce81715..69c384835de469d5ccc68e7f825417a7d8eb10c5 100644
--- a/indra/newview/lltoastalertpanel.cpp
+++ b/indra/newview/lltoastalertpanel.cpp
@@ -352,12 +352,14 @@ bool LLToastAlertPanel::setCheckBox( const std::string& check_title, const std::
 
 void LLToastAlertPanel::setVisible( BOOL visible )
 {
-	LLToastPanel::setVisible( visible );
-	
-	if( visible )
+	// only make the "ding" sound if it's newly visible
+	if( visible && !LLToastPanel::getVisible() )
 	{
 		make_ui_sound("UISndAlert");
 	}
+
+	LLToastPanel::setVisible( visible );
+	
 }
 
 LLToastAlertPanel::~LLToastAlertPanel()
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 5849a40726177db28c2cb49654e4ea954c827313..33568bf3cb55080bd497f07cb67a597908cf2235 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2451,6 +2451,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
             // adding temporarily so that communications window chat bar 
             // works until the new chat window is ready
+			chat.mText = from_name + ": " + chat.mText;
 			LLFloaterChat::addChat(chat, FALSE, FALSE);
 		}
 		else