diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 294dfb319..35a57e811 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -762,7 +762,7 @@ Found in Advanced->Rendering->Info Displays</string>
     <key>ShowLocalChatFloaterBar</key>
     <map>
       <key>Comment</key>
-	  <string>Whether or not local chat should have an input bar, requires a restart.</string>
+	  <string>Whether or not local chat should have an input bar when undocked, requires docking and undocking if already undocked.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -6301,22 +6301,6 @@ This should be as low as possible, but too low may break functionality</string>
         <integer>0</integer>
       </array>
     </map>
-    <key>FloaterChatBarlessRect</key>
-    <map>
-      <key>Comment</key>
-	  <string>Rectangle for chat history without input bar</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Rect</string>
-      <key>Value</key>
-      <array>
-        <integer>0</integer>
-        <integer>172</integer>
-        <integer>500</integer>
-        <integer>0</integer>
-      </array>
-    </map>
     <key>FloaterClothingRect</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index db38f8009..1a0fa4abd 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -107,9 +107,7 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
 	mFactoryMap["chat_panel"] = LLCallbackMap(createChatPanel, NULL);
 	mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, NULL);
 	// do not automatically open singleton floaters (as result of getInstance())
-	BOOL no_open = FALSE;
-	bool show_bar = gSavedSettings.getBOOL("ShowLocalChatFloaterBar");
-	LLUICtrlFactory::getInstance()->buildFloater(this, (show_bar ? "floater_chat_history.xml" : "floater_chat_history_barless.xml"), &getFactoryMap(), no_open);
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chat_history.xml", &getFactoryMap(), /*no_open =*/false);
 
 	childSetCommitCallback("show mutes",onClickToggleShowMute,this); //show mutes
 	childSetCommitCallback("translate chat",onClickToggleTranslateChat,this);
diff --git a/indra/newview/llfloaterchatterbox.cpp b/indra/newview/llfloaterchatterbox.cpp
index 876e2c321..178ddc4c3 100644
--- a/indra/newview/llfloaterchatterbox.cpp
+++ b/indra/newview/llfloaterchatterbox.cpp
@@ -235,6 +235,7 @@ void LLFloaterChatterBox::removeFloater(LLFloater* floaterp)
 		// only my friends floater now locked
 		mTabContainer->lockTabs(mTabContainer->getNumLockedTabs() - 1);
 		gSavedSettings.setBOOL("ChatHistoryTornOff", TRUE);
+		if (!gSavedSettings.getBOOL("ShowLocalChatFloaterBar")) floaterp->childSetVisible("chat_layout_panel", false);
 		floaterp->setCanClose(TRUE);
 	}
 	else if (floaterp->getName() == "floater_my_friends")
@@ -276,6 +277,7 @@ void LLFloaterChatterBox::addFloater(LLFloater* floaterp,
 		// make sure first two tabs are now locked
 		mTabContainer->lockTabs(num_locked_tabs + 1);
 		gSavedSettings.setBOOL("ChatHistoryTornOff", FALSE);
+		floaterp->childSetVisible("chat_layout_panel", true);
 		floaterp->setCanClose(FALSE);
 	}
 	else if (floaterp->getName() == "floater_my_friends")
diff --git a/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 1afed9c2f..3d917fb28 100644
--- a/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -23,7 +23,9 @@
 	<string name="TeleportYourAgent">Teleport you</string>
 	<string name="ControlYourCamera">Control your camera</string>
 	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="260" left="0" orientation="horizontal" width="430" name="panels">
-		<layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0" min_width="275" name="im_contents_panel" width="305">
+		<layout_panel border="false" bottom="0" height="260" left="0" min_width="275" name="im_contents_panel" width="305">
+         <layout_stack border="false" bottom="0" default_tab_group="1" follows="all" height="260" left="0" orientation="vertical" name="im_contents_stack" width="305">
+          <layout_panel border="false" bottom="10" follows="all" height="235" left="0" name="history_panel" width="305">
 			<combo_box follows="left|top" height="18" label="Gestures" left="6" name="Gesture" width="120">
 				<combo_item name="Gestures">Gestures</combo_item>
 			</combo_box>
@@ -31,9 +33,11 @@
 			<!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Translate Chat (powered by Google)" name="translate chat" width="100"/-->
 			<button bottom_delta="2" left_delta="120" follows="left|top" font="SansSerifSmall" height="20" width="100" label="Open History" name="chat_history_open" tool_tip="Click here to open chat history in external editor."/>
 			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn" right="305" tool_tip="Click here to show a list of active participants in this IM session." width="80"/>
-			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="28" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="81" left="5" max_length="2147483647" name="Chat History Editor" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
-			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="28" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="81" max_length="2147483647" name="Chat History Editor with mute" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
-			<panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5" tab_group="1" top="25">
+			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="0" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="207" left="5" max_length="2147483647" name="Chat History Editor" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
+			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="0" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="207" max_length="2147483647" name="Chat History Editor with mute" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
+          </layout_panel>
+          <layout_panel user_resize="false" auto_resize="false" bottom_delta="-25" follows="left|right|bottom" left="5" name="chat_layout_panel" right="-5" tab_group="1" height="25">
+			<panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5" top="25">
 				<string name="gesture_label">Gestures</string>
 				<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0" follows="left|right|bottom" font="SansSerif" handle_edit_keys_directly="false" height="20" label="Click here to chat." left="0" max_length="2147483647" name="Chat Editor" right="-60" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" spell_check="true"/>
 				<flyout_button bottom_delta="0" follows="right|bottom" height="20" label="Say" left="-57" list_position="above" name="Say" tool_tip="(Enter)" width="60">
@@ -42,6 +46,8 @@
 					<flyout_button_item value="whisper" name="whisper_item">Whisper</flyout_button_item>
 				</flyout_button>
 			</panel>
+          </layout_panel>
+         </layout_stack>
 		</layout_panel>
 		<layout_panel auto_resize="false" bottom="0" can_resize="true" filename="panel_speaker_controls.xml" height="120" left="0" min_width="140" name="active_speakers_panel" top_delta="0" visible="false" width="140"/>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/en-us/floater_chat_history_barless.xml b/indra/newview/skins/default/xui/en-us/floater_chat_history_barless.xml
deleted file mode 100644
index fd6eb9091..000000000
--- a/indra/newview/skins/default/xui/en-us/floater_chat_history_barless.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="true" can_tear_off="true" enabled="true" height="275" left="15"
-     min_height="150" min_width="425" name="chat floater" rect_control="FloaterChatBarlessRect" title="Local Chat" width="435">
-	<string name="ringing">Connecting to in-world Voice Chat...</string>
-	<string name="connected">Connected</string>
-	<string name="unavailable">Voice not available at your current location</string>
-	<string name="hang_up">Disconnected from in-world Voice Chat</string>
-	<string name="voice_icon">icn_voice-localchat.tga</string>
-	<string name="IM_logging_string">-- Instant message logging enabled --</string>
-	<string name="IM_end_log_string">-- End of Log --</string>
-	<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
-	<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
-	<string name="ScriptTakeMoney">Take in-world money ([CURRENCY]) from you</string>
-	<string name="ActOnControlInputs">Act on your control inputs</string>
-	<string name="RemapControlInputs">Remap your control inputs</string>
-	<string name="AnimateYourAvatar">Animate your avatar</string>
-	<string name="AttachToYourAvatar">Attach to your avatar</string>
-	<string name="ReleaseOwnership">Release ownership and become public</string>
-	<string name="LinkAndDelink">Link and delink from other objects</string>
-	<string name="AddAndRemoveJoints">Add and remove joints with other objects</string>
-	<string name="ChangePermissions">Change its permissions</string>
-	<string name="TrackYourCamera">Track your camera</string>
-	<string name="TeleportYourAgent">Teleport you</string>
-	<string name="ControlYourCamera">Control your camera</string>
-	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="260" left="0" orientation="horizontal" width="430" name="panels">
-		<layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0" min_width="275" name="im_contents_panel" width="305">
-			<combo_box follows="left|top" height="18" label="Gestures" left="6" name="Gesture" width="120">
-				<combo_item name="Gestures">Gestures</combo_item>
-			</combo_box>
-			<check_box bottom_delta="-2" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Show Muted Text" left_delta="124" name="show mutes" width="116"/>
-			<!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Translate Chat (powered by Google)" name="translate chat" width="100"/-->
-			<button bottom_delta="2" left_delta="120" follows="left|top" font="SansSerifSmall" height="20" width="100" label="Open History" name="chat_history_open" tool_tip="Click here to open chat history in external editor."/>
-			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn" right="305" tool_tip="Click here to show a list of active participants in this IM session." width="80"/>
-			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="5" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="104" left="5" max_length="2147483647" name="Chat History Editor" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
-			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="5" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="104" max_length="2147483647" name="Chat History Editor with mute" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
-			<panel bottom="0" left="0" name="chat_panel" height="0" width="0" visible="false">
-				<string name="gesture_label">Gestures</string>
-			</panel>
-		</layout_panel>
-		<layout_panel auto_resize="false" bottom="0" can_resize="true" filename="panel_speaker_controls.xml" height="120" left="0" min_width="140" name="active_speakers_panel" top_delta="0" visible="false" width="140"/>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_chat_history_barless.xml b/indra/newview/skins/default/xui/es/floater_chat_history_barless.xml
deleted file mode 100644
index e0882ca49..000000000
--- a/indra/newview/skins/default/xui/es/floater_chat_history_barless.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="chat floater" title="Chat Local">
-	<string name="ringing">
-		Conectándose con el Chat de Voz...
-	</string>
-	<string name="connected">
-		Conectado
-	</string>
-	<string name="unavailable">
-		El Chat de Voz no está disponible en esta ubicación
-	</string>
-	<string name="hang_up">
-		Desconectado del Chat de Voz
-	</string>
-	<string name="IM_logging_string">
-		-- Habilitado el registro de Mensajes Instantáneos --
-	</string>
-	<string name="IM_end_log_string">
-		-- Fin del Registro --
-	</string>
-	<string name="ScriptQuestionCautionChatGranted">
-		'[OBJECTNAME]', al objeto, propiedad de '[OWNERNAME]', ubicado en [REGIONNAME]: [REGIONPOS], se le ha concedido permiso para: [PERMISSIONS].
-	</string>
-	<string name="ScriptQuestionCautionChatDenied">
-		'[OBJECTNAME]', al objeto, propiedad de '[OWNERNAME]', ubicado en [REGIONNAME]: [REGIONPOS], se le ha denegado permiso para: [PERMISSIONS].
-	</string>
-	<string name="ScriptTakeMoney">
-		Transferir dinero ([CURRENCY]) de tu cuenta
-	</string>
-	<string name="ActOnControlInputs">
-		Actuar en tus controles de entrada
-	</string>
-	<string name="RemapControlInputs">
-		Reconfigurar tus controles de entrada
-	</string>
-	<string name="AnimateYourAvatar">
-		Animar tu Avatar
-	</string>
-	<string name="AttachToYourAvatar">
-		Anexarse a tu Avatar
-	</string>
-	<string name="ReleaseOwnership">
-		Liberar propiedad y volverse público
-	</string>
-	<string name="LinkAndDelink">
-		Enlazar y desenlazar de otros objetos
-	</string>
-	<string name="AddAndRemoveJoints">
-		Agregar y quitar uniones con otros objetos
-	</string>
-	<string name="ChangePermissions">
-		Cambiar sus propios permisos
-	</string>
-	<string name="TrackYourCamera">
-		Seguir tu cámara
-	</string>
-	<string name="TeleportYourAgent">
-		Teleportarte
-	</string>
-	<string name="ControlYourCamera">
-		Controlar tu cámara
-	</string>
-	<layout_stack name="panels">
-		<layout_panel name="im_contents_panel">
-			<combo_box label="Gestos" name="Gesture">
-				<combo_item name="Gestures">
-					Gestos
-				</combo_item>
-			</combo_box>
-			<check_box label="Mostrar Texto Ignorado" left_delta="124" name="show mutes" width="116"/>
-			<!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Translate Chat (powered by Google)" name="translate chat" width="100"/-->
-			<button label="Abrir Historial" name="chat_history_open" tool_tip="Pulsa aquí para abrir el historial en un editor externo."/>
-			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Pulsa aquí para mostrar/ocultar la lista de participantes activos en esta sesión de MI." width="80"/>
-			<panel name="chat_panel">
-				<string name="gesture_label">
-					Gestos
-				</string>
-			</panel>
-		</layout_panel>
-		<layout_panel name="active_speakers_panel"/>
-	</layout_stack>
-</floater>