diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4fbf49d64..46f60aedb 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4352,6 +4352,17 @@ This should be as low as possible, but too low may break functionality</string>
       <key>Value</key>
       <real>0.700</real>
     </map>
+    <key>ConsoleBottomOffset</key>
+    <map>
+      <key>Comment</key>
+      <string>User definable offset between the bottom of the chat console and the bottom of the window; increase to move text in the console up</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <real>0</real>
+    </map>
     <key>ConsoleBufferSize</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llprefschat.cpp b/indra/newview/llprefschat.cpp
index 559ad2ba9..f62a4d4e9 100644
--- a/indra/newview/llprefschat.cpp
+++ b/indra/newview/llprefschat.cpp
@@ -55,6 +55,7 @@ private:
 	S32	mChatSize;
 	F32	mChatPersist;
 	S32	mChatMaxLines;
+	S32	mChatBottomOffset;
 	LLColor4 mSystemChatColor;
 	LLColor4 mUserChatColor;
 	LLColor4 mAgentChatColor;
@@ -115,6 +116,7 @@ void LLPrefsChatImpl::refreshValues()
 	mChatSize = gSavedSettings.getS32("ChatFontSize");
 	mChatPersist = gSavedSettings.getF32("ChatPersistTime");
 	mChatMaxLines = gSavedSettings.getS32("ConsoleMaxLines");
+	mChatBottomOffset = gSavedSettings.getS32("ConsoleBottomOffset");
 	mSystemChatColor = gSavedSettings.getColor4("SystemChatColor");
 	mUserChatColor = gSavedSettings.getColor4("UserChatColor");
 	mAgentChatColor = gSavedSettings.getColor4("AgentChatColor");
@@ -140,6 +142,7 @@ void LLPrefsChatImpl::cancel()
 	gSavedSettings.setS32("ChatFontSize", mChatSize);
 	gSavedSettings.setF32("ChatPersistTime", mChatPersist);
 	gSavedSettings.setS32("ConsoleMaxLines", mChatMaxLines);
+	gSavedSettings.setS32("ConsoleBottomOffset", mChatBottomOffset);
 	gSavedSettings.setColor4("SystemChatColor", mSystemChatColor);
 	gSavedSettings.setColor4("UserChatColor", mUserChatColor);
 	gSavedSettings.setColor4("AgentChatColor", mAgentChatColor);
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index ff4d8ce5d..1da9206ca 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -5380,7 +5380,8 @@ void LLViewerWindow::calcDisplayScale()
 
 S32 LLViewerWindow::getChatConsoleBottomPad()
 {
-	S32 offset = 0;
+	static const LLCachedControl<S32> user_offset("ConsoleBottomOffset");
+	S32 offset = user_offset;
 
 	if(gToolBar && gToolBar->getVisible())
 		offset += TOOL_BAR_HEIGHT;
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index d225fa95a..5dca51194 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -22,6 +22,7 @@
 	<text bottom_delta="6" follows="top" height="10" left="282" name="text_box4">(seconds)</text>
 	<spinner bottom_delta="-6" decimal_digits="0" follows="top" height="16" increment="1" initial_val="10" left="340" max_val="50" min_val="1" name="max_chat_count" width="60"/>
 	<text bottom_delta="6" follows="left|top" height="10" left="405" name="text_box5">(# lines)</text>
+	<spinner bottom_delta="-25" decimal_digits="0" follows="top" height="16" increment="1" left="148" max_val="3000" min_val="0" width="130" control_name="ConsoleBottomOffset" name="chat_bottom_offset" label="Bottom offset" label_width="80" tool_tip="Offset in pixels between the chat console and the bottom of the viewer."/>
 	<slider bottom_delta="-25" control_name="ConsoleBackgroundOpacity" follows="top" height="12" increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1" min_val="0" name="console_opacity" value="0.4" width="200"/>
 	<check_box bottom_delta="-25" control_name="ChatFullWidth" follows="top" height="16" initial_value="false" label="Use full screen width (Requires restart)" name="chat_full_width_check"/>
 	<text bottom_delta="-12" height="10" left="12"	     mouse_opaque="false" name="text_box6" v_pad="0" width="135">Chat Options:</text>