diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 1ff858b497772f9f73d3ca576e33772b4f965685..7bea0e194c44b6055c0a7698b9ceed2490b4881d 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -48,7 +48,7 @@
            available_in_toybox="true"
 		   is_flashing_allowed="true"
            icon="Command_Chat_Icon"
-           label_ref="Command_Chat_Label"
+           label_ref="Command_Conversations_Label"
            tooltip_ref="Command_Conversations_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="im_container"
@@ -170,6 +170,17 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="moveview"
            />
+  <command name="nearby_chat"
+           available_in_toybox="true"
+           is_flashing_allowed="true"
+           icon="Command_Chat_Icon"
+           label_ref="Command_Chat_Label"
+           tooltip_ref="Command_Chat_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="nearby_chat"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="nearby_chat"
+           />
   <command name="people"
            available_in_toybox="true"
            icon="Command_People_Icon"
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 6d2dc6d4b13f4353e7514016a44a96d2a19428ca..71e62e5694daef65d6949a25e028cc2b23b1c761 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -295,7 +295,7 @@ void LLFloaterIMNearbyChat::setVisible(BOOL visible)
 {
 	LLFloaterIMSessionTab::setVisible(visible);
 
-	if(visible)
+	if(visible && isMessagePaneExpanded())
 	{
 		removeScreenChat();
 	}
@@ -306,7 +306,7 @@ void LLFloaterIMNearbyChat::setVisibleAndFrontmost(BOOL take_focus, const LLSD&
 {
 	LLFloaterIMSessionTab::setVisibleAndFrontmost(take_focus, key);
 
-	if(matchesKey(key))
+	if(!isTornOff() && matchesKey(key))
 	{
 		LLFloaterIMContainer::getInstance()->selectConversationPair(mSessionID, true, take_focus);
 	}
@@ -632,6 +632,10 @@ void LLFloaterIMNearbyChat::sendChat( EChatType type )
 	if (gSavedSettings.getBOOL("CloseChatOnReturn"))
 	{
 		stopChat();
+		if (isTornOff())
+		{
+			closeHostedFloater();
+		}
 	}
 }
 
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp
index 6b43580ba7a64378b697c924cadc87a660aeb6e6..c27d80c90a035c37a835b342f1b519bc587cca12 100644
--- a/indra/newview/llfloaterimnearbychathandler.cpp
+++ b/indra/newview/llfloaterimnearbychathandler.cpp
@@ -679,7 +679,8 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
 		//}
 
         //Will show toast when chat preference is set        
-        if((gSavedSettings.getString("NotificationNearbyChatOptions") == "toast") || !nearby_chat->isMessagePanelVisible())
+		static LLCachedControl<bool> sChatInWindow(gSavedSettings, "AlchemyNearbyChatInput", true);
+        if((gSavedSettings.getString("NotificationNearbyChatOptions") == "toast") || (sChatInWindow))
         {
             // Add a nearby chat toast.
             LLUUID id;
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 1c357fae8a96764c06d5a899dbcfaf81800e2cfb..db94f163ce60876b74865277417a3b5bae20d0e3 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -983,7 +983,8 @@ void LLFloaterIMSessionTab::onOpen(const LLSD& key)
 	{
 		LLFloaterIMContainer* host_floater = dynamic_cast<LLFloaterIMContainer*>(getHost());
 		// Show the messages pane when opening a floater hosted in the Conversations
-		host_floater->collapseMessagesPane(false);
+		if (host_floater)
+            host_floater->collapseMessagesPane(false);
 	}
 
 	mInputButtonPanel->setVisible(isTornOff());
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 37637458a3406416cb4acb64ce07ea67b8606aec..f09e2cb8e15eb47f9d05f43a4995ee1c7cd3dbf2 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -349,17 +349,23 @@ void notify_of_message(const LLSD& msg, bool is_dnd_msg)
 		&& !is_session_focused
 		&& !is_dnd_msg) //prevent flashing FUI button because the conversation floater will have already opened
 	{
-		if(!LLMuteList::getInstance()->isMuted(participant_id))
-    {
-			if(!gAgent.isDoNotDisturb())
-    	{
-				gToolBarView->flashCommand(LLCommandId("chat"), true, im_box->isMinimized());
-    	}
-			else
+		// Prevent flashing for nearby chat when chat bar is active
+		static LLCachedControl<bool> sChatInWindow(gSavedSettings, "AlchemyNearbyChatInput", true);
+		if (!sChatInWindow
+			|| (participant_id.notNull() && session_id.notNull()))
+		{
+			if (!LLMuteList::getInstance()->isMuted(participant_id))
 			{
-				store_dnd_message = true;
+				if (!gAgent.isDoNotDisturb())
+				{
+					gToolBarView->flashCommand(LLCommandId("chat"), true, im_box->isMinimized());
+				}
+				else
+				{
+					store_dnd_message = true;
+				}
 			}
-    }
+		}
 	}
 
     // 4. Toast
diff --git a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
index 90a7143bde064d6e50f5e08422ff96f02bf26042..722a927fd7926ba5a64683a3982174df69a68e80 100644
--- a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
+++ b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
@@ -46,6 +46,27 @@
          function="IMSession.Menu.ShowModes.Enable"
          parameter="IMShowNamesForP2PConv" />    
     </menu_item_check>
+	<menu_item_separator />
+	<menu_item_check
+	 label="&quot;:&quot; as a synonym for &quot;/me&quot;"
+	 name="EnableMUPoseChat">
+		<menu_item_check.on_check
+		 function="CheckControl"
+		 parameter="EnableMUPoseChat" />
+		<menu_item_check.on_click
+		 function="ToggleControl"
+		 parameter="EnableMUPoseChat" />
+	</menu_item_check>
+	<menu_item_check
+	 label="Auto-close ((OOC)) parentheses"
+	 name="EnableAutoCloseOOC">
+		<menu_item_check.on_check
+		 function="CheckControl"
+		 parameter="EnableAutoCloseOOC" />
+		<menu_item_check.on_click
+		 function="ToggleControl"
+		 parameter="EnableAutoCloseOOC" />
+	</menu_item_check>
 	<menu_item_separator layout="topleft" />
 	<menu_item_check
 	 label="Chat Alerts..."
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7ee4adf504625b7de37a07ef2badfc097966720c..efa27f12d39fb17e70a6f9de22286689ea632f56 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4205,7 +4205,7 @@ name="Command_360_Capture_Label">360 snapshot</string>
   <string name="Command_Appearance_Label">Outfits</string>
   <string name="Command_Avatar_Label">Complete Avatars</string>
   <string name="Command_Build_Label">Build</string>
-  <string name="Command_Chat_Label">Chat</string>
+  <string name="Command_Chat_Label">Nearby Chat</string>
   <string name="Command_Conversations_Label">Conversations</string>
   <string name="Command_Compass_Label">Compass</string>
   <string name="Command_Debug_Label">Debug Settings</string>