diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7d0641eb62..c719fd2e6e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -21667,6 +21667,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>120</integer>
     </map>
+    <key>FSUseSingleLineChatEntry</key>
+      <map>
+      <key>Comment</key>
+      <string>Use single line chat entry instead of auto-expanding chat entry</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/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp
index 0215c7ca11..ac3f7adfff 100644
--- a/indra/newview/fsfloaterim.cpp
+++ b/indra/newview/fsfloaterim.cpp
@@ -826,6 +826,7 @@ BOOL FSFloaterIM::postBuild()
 	mInputEditor->setCommitOnFocusLost( FALSE );
 	mInputEditor->setPassDelete(TRUE);
 	mInputEditor->setFont(LLViewerChat::getChatFont());
+	mInputEditor->enableSingleLineMode(gSavedSettings.getBOOL("FSUseSingleLineChatEntry"));
 
 	childSetCommitCallback("chat_editor", onSendMsg, this);
 
diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index 5c1827456c..b4c71260eb 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -150,6 +150,7 @@ BOOL FSFloaterNearbyChat::postBuild()
 		mInputEditor->setPassDelete(TRUE);
 		mInputEditor->setFont(LLViewerChat::getChatFont());
 		mInputEditor->setLabel(getString("chatbox_label"));
+		mInputEditor->enableSingleLineMode(gSavedSettings.getBOOL("FSUseSingleLineChatEntry"));
 	}
 	mChatLayoutPanel = getChild<LLLayoutPanel>("chat_layout_panel");
 	mInputPanels = getChild<LLLayoutStack>("input_panels");
diff --git a/indra/newview/fsnearbychatcontrol.cpp b/indra/newview/fsnearbychatcontrol.cpp
index 29043d8bb0..4f1d7f0989 100644
--- a/indra/newview/fsnearbychatcontrol.cpp
+++ b/indra/newview/fsnearbychatcontrol.cpp
@@ -27,72 +27,30 @@
 
 #include "llviewerprecompiledheaders.h"
 
+// llui
+#include "lllineeditor.h"
+#include "llmenugl.h"
+#include "llspinctrl.h"
+
+// newview
 #include "fsnearbychatcontrol.h"
 #include "fsnearbychathub.h"
-// <FS:Ansariel> [FS communication UI]
-//#include "llfloaternearbychat.h"
 #include "fsfloaternearbychat.h"
-// </FS:Ansariel> [FS communication UI]
-// #include "llviewercontrol.h"
-// #include "llviewerwindow.h"
-// #include "llrootview.h"
-//#include "llchatitemscontainerctrl.h"
-// #include "lliconctrl.h"
-#include "llspinctrl.h"
-// #include "llfloatersidepanelcontainer.h"
-// #include "llfocusmgr.h"
-// #include "lllogchat.h"
-// #include "llresizebar.h"
-// #include "llresizehandle.h"
-#include "llmenugl.h"
-#include "llviewermenu.h"//for gMenuHolder
-
+#include "llagent.h" 		// gAgent
+#include "llagentcamera.h"	// gAgentCamera
 #include "llfloaterimnearbychathandler.h"
-// #include "llnearbychatbar.h"	// <FS:Zi> Remove floating chat bar
-// #include "llchannelmanager.h"
-
-#include "llagent.h" 			// gAgent
-#include "llagentcamera.h"		// gAgentCamera
-// #include "llchathistory.h"
-// #include "llstylemap.h"
-
-// #include "llavatarnamecache.h"
-
-// #include "lldraghandle.h"
-
-// #include "llnearbychatbar.h"	// <FS:Zi> Remove floating chat bar
-// #include "llfloaterreg.h"
-// #include "lltrans.h"
-
-// IM
-// #include "llbutton.h"
-// #include "lllayoutstack.h"
-
-// #include "llimfloatercontainer.h"
-// #include "llimfloater.h"
-#include "lllineeditor.h"
+#include "llviewermenu.h"	//for gMenuHolder
 
 //AO - includes for textentry
-#include "rlvhandler.h"
-#include "llcommandhandler.h"
-#include "llkeyboard.h"
-#include "llgesturemgr.h"
-#include "llmultigesture.h"
 #include "llautoreplace.h"
-
-// #include "llconsole.h"
-// #include "fscontactsfloater.h"
-
-// <FS:Zi> Moved nearby chat functionality here for now
-// #include "chatbar_as_cmdline.h"
-// #include "llanimationstates.h"	// ANIM_AGENT_WHISPER, ANIM_AGENT_TALK, ANIM_AGENT_SHOUT
-// #include "llviewerstats.h"
-// </FS:Zi>
-// <FS:CR> FIRE-3192 - Name Prediction
-#include "llworld.h"
+#include "llcommandhandler.h"
+#include "llgesturemgr.h"
+#include "llkeyboard.h"
+#include "llmultigesture.h"
+#include "llworld.h"	// <FS:CR> FIRE-3192 - Name Prediction
+#include "rlvhandler.h"
 
 static const U32 NAME_PREDICTION_MINIMUM_LENGTH = 3;
-// </FS:CR>
 
 static LLDefaultChildRegistry::Register<FSNearbyChatControl> r("fs_nearby_chat_control");