diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a75cd0daf8..bc0e9590c1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -24319,6 +24319,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>FSBubblesHideConsoleAndToasts</key>
+    <map>
+      <key>Comment</key>
+      <string>If enabled, using bubble chat will hide the chat output in the Nearby Chat console and toasts</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
   </map>
 </llsd>
 
diff --git a/indra/newview/fsconsoleutils.cpp b/indra/newview/fsconsoleutils.cpp
index 630ed30a7b..e960174c61 100644
--- a/indra/newview/fsconsoleutils.cpp
+++ b/indra/newview/fsconsoleutils.cpp
@@ -43,6 +43,7 @@ bool FSConsoleUtils::ProcessChatMessage(const LLChat& chat_msg, const LLSD &args
 {
 	static LLCachedControl<bool> fsUseNearbyChatConsole(gSavedSettings, "FSUseNearbyChatConsole");
 	static LLCachedControl<bool> useChatBubbles(gSavedSettings, "UseChatBubbles");
+	static LLCachedControl<bool> fsBubblesHideConsoleAndToasts(gSavedSettings, "FSBubblesHideConsoleAndToasts");
 
 	if (!fsUseNearbyChatConsole)
 	{
@@ -51,7 +52,7 @@ bool FSConsoleUtils::ProcessChatMessage(const LLChat& chat_msg, const LLSD &args
 
 	// Don't write to console if avatar chat and user wants
 	// bubble chat or if the user is busy.
-	if ( (chat_msg.mSourceType == CHAT_SOURCE_AGENT && useChatBubbles)
+	if ( (chat_msg.mSourceType == CHAT_SOURCE_AGENT && useChatBubbles && fsBubblesHideConsoleAndToasts)
 		|| gAgent.isDoNotDisturb() )
 	{
 		return true;
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp
index ac5c8fab57..77f0710d00 100644
--- a/indra/newview/llfloaterimnearbychathandler.cpp
+++ b/indra/newview/llfloaterimnearbychathandler.cpp
@@ -695,11 +695,13 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
 	// </FS:Ansariel>
 
 	static LLCachedControl<bool> useChatBubbles(gSavedSettings, "UseChatBubbles");
+	static LLCachedControl<bool> fsBubblesHideConsoleAndToasts(gSavedSettings, "FSBubblesHideConsoleAndToasts");
 	// <FS:Ansariel> [FS communication UI]
 	//if((  ( chat_msg.mSourceType == CHAT_SOURCE_AGENT
+	//		&& useChatBubbles )
 	if(  ( chat_msg.mSourceType == CHAT_SOURCE_AGENT
+			&& useChatBubbles && fsBubblesHideConsoleAndToasts )
 	// </FS:Ansariel> [FS communication UI]
-			&& useChatBubbles )
 		|| mChannel.isDead()
 		|| !mChannel.get()->getShowToasts() )
 	// <FS:Ansariel> [FS communication UI]
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 2ca70afd96..45c4bb512a 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -21,6 +21,7 @@
 			<check_box name="FSMarkObjects" label="Objektename als (namenlos) anzeigen, um Vortäuschungen zu unterbinden"/>
 			<check_box label="llOwnerSay durch Skript-Debug-Fenster routen" name="FSllOwnerSayToScriptDebugWindow_checkbox"/>
 			<check_box label="Blasen-Chat" name="bubble_text_chat"/>
+			<check_box label="Chat in der Nähe in Konsole und Toasts nicht anzeigen" name="FSBubblesHideConsoleAndToasts"/>
 			<check_box label="Eingabe-Indikator in Blase oberhalb eines Avatars anzeigen" name="bubble_text_typing"/> 
 			<check_box label="Eingabe-Indikator in Avatarnamen oberhalb eines Avatars anzeigen" name="FSShowTypingStateInNameTag"/> 
 			<check_box label="Sekunden in Zeitstempel anzeigen [HH:MM:SS]" name="FSSecondsinChatTimestamps"/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 43e04d2cf1..659667cf6f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -155,12 +155,24 @@
              top_pad="1"
              name="bubble_text_chat"
              width="150" />
+            <check_box
+             control_name="FSBubblesHideConsoleAndToasts"
+             enabled_control="UseChatBubbles"
+             follows="left|top"
+             height="16"
+             label="Don't show chat in Nearby Chat console and toasts"
+             layout="topleft"
+             left="30"
+             top_pad="1"
+             name="FSBubblesHideConsoleAndToasts"
+             width="150" />
             <check_box
              control_name="UseTypingBubbles"
              follows="left|top"
              height="16"
              label="Show typing indicator in bubbles above avatars"
              layout="topleft"
+             left="20"
              top_pad="1"
              name="bubble_text_typing"
              width="150" />