diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a835cb6cab..ae3c99cec8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -20829,5 +20829,16 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FSOpenIMContainerOnOfflineMessage</key>
+    <map>
+      <key>Comment</key>
+      <string>Open the IM container at login when an offline message is present.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
 </map>
 </llsd>
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 8f79b09ce5..cee920cfbc 100755
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -54,6 +54,7 @@
 //#include "llfloaterimsession.h"
 //#include "llfloaterimcontainer.h"
 #include "fsfloaterim.h"
+#include "fsfloaterimcontainer.h"
 // </FS:Ansariel> [FS communication UI]
 #include "llgroupiconctrl.h"
 #include "llmd5.h"
@@ -3052,14 +3053,16 @@ void LLIMMgr::addMessage(
 	}
 
 	// Open conversation floater if offline messages are present
-	// <FS:Ansariel> [FS communication UI]
+	// <FS:CR> Only open it when the user opts to do so...
 	//if (is_offline_msg)
- //   {
- //       LLFloaterReg::showInstance("im_container");
+	if (is_offline_msg && gSavedSettings.getBOOL("FSOpenIMContainerOnOfflineMessage"))
+    {
+    //    LLFloaterReg::showInstance("im_container");
 	//    LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container")->
 	//    		flashConversationItemWidget(new_session_id, true);
- //   }
-	// </FS:Ansariel> [FS communication UI]
+		LLFloaterReg::showInstance("fs_im_container");
+	// </FS:CR>
+    }
 }
 
 void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLSD& args)
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 9942200cd8..710f8c5821 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -555,6 +555,15 @@
              left="30"
              width="400"
              height="18"
+             name="FSOpenIMContainerOnOfflineMessage"
+             control_name="FSOpenIMContainerOnOfflineMessage"
+             label="Open Conversations when an offline message has been received"/>
+			<check_box
+             layout="topleft"
+             follows="left|top"
+             top_pad="1"
+             width="400"
+             height="18"
              name="FSShowIMInChatHistory"
              control_name="FSShowIMInChatHistory"
              label="Show IMs in nearby chat window"/>