diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index 11fa26b94..6ea23c3c4 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -1,12 +1,12 @@
 /** 
- * @file hbprefsinert.cpp
- * @author Henri Beauchamp
- * @brief Ascent Viewer preferences panel
+ * @file ascentprefssys.cpp
+ * @Ascent Viewer preferences panel
  *
  * $LicenseInfo:firstyear=2008&license=viewergpl$
  * 
  * Copyright (c) 2008, Henri Beauchamp.
- * 
+ * Rewritten in its entirety 2010 Hg Beeks. 
+ *
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
@@ -258,6 +258,22 @@ void LLPrefsAscentSysImpl::refresh()
 	}
 
 	childSetValue("seconds_in_chat_and_ims_check",	mEnableOOCAutoClose);
+
+
+	LLWString auto_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("AscentInstantMessageResponse") );
+	LLWStringUtil::replaceChar(auto_response, '^', '\n');
+	LLWStringUtil::replaceChar(auto_response, '%', ' ');
+	childSetText("im_response", wstring_to_utf8str(auto_response));
+	childSetValue("AscentInstantMessageResponseFriends", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseFriends"));
+	childSetValue("AscentInstantMessageResponseMuted", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseMuted"));
+	childSetValue("AscentInstantMessageResponseAnyone", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseAnyone"));
+	childSetValue("AscentInstantMessageShowResponded", gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowResponded"));
+	childSetValue("AscentInstantMessageShowOnTyping", gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowOnTyping"));
+	childSetValue("AscentInstantMessageResponseRepeat", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat" ));
+	childSetValue("AscentInstantMessageResponseItem", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseItem"));
+	childSetValue("AscentInstantMessageAnnounceIncoming", gSavedPerAccountSettings.getBOOL("AscentInstantMessageAnnounceIncoming"));
+
+
 	//Save Performance --------------------------------------------------------------------
 	childSetValue("fetch_inventory_on_login_check", mFetchInventoryOnLogin);
 	childSetValue("enable_wind", mEnableLLWind);
@@ -421,9 +437,20 @@ void LLPrefsAscentSysImpl::apply()
 	gSavedSettings.setString("ShortTimeFormat",			short_time);
 	gSavedSettings.setString("LongTimeFormat",			long_time);
 	gSavedSettings.setString("TimestampFormat",			timestamp);
-
 	gSavedSettings.setBOOL("SecondsInChatAndIMs",		childGetValue("seconds_in_chat_and_ims_check"));
 
+
+	gSavedPerAccountSettings.setString("AscentInstantMessageResponse",			childGetValue("im_response").asString());
+	gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted",		childGetValue("AscentInstantMessageResponseMuted").asBoolean());
+	gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends",		childGetValue("AscentInstantMessageResponseFriends").asBoolean());
+	gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted",		childGetValue("AscentInstantMessageResponseMuted").asBoolean());
+	gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone",		childGetValue("AscentInstantMessageResponseAnyone").asBoolean());
+	gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowResponded",		childGetValue("AscentInstantMessageShowResponded").asBoolean());
+	gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowOnTyping",		childGetValue("AscentInstantMessageShowOnTyping").asBoolean());
+	gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat",		childGetValue("AscentInstantMessageResponseRepeat").asBoolean());
+	gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem",		childGetValue("AscentInstantMessageResponseItem").asBoolean());
+	gSavedPerAccountSettings.setBOOL("AscentInstantMessageAnnounceIncoming",	childGetValue("AscentInstantMessageAnnounceIncoming").asBoolean());
+
 	//Performance ----------------------------------------------------------------------------
 	gSavedSettings.setBOOL("FetchInventoryOnLogin",		childGetValue("fetch_inventory_on_login_check"));
 	gSavedSettings.setBOOL("WindEnabled",				childGetValue("enable_wind"));
diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp
index 3e71b9046..641b76fe3 100644
--- a/indra/newview/ascentprefsvan.cpp
+++ b/indra/newview/ascentprefsvan.cpp
@@ -1,11 +1,11 @@
 /** 
- * @file hbprefsinert.cpp
- * @author Henri Beauchamp
- * @brief Ascent Viewer preferences panel
+ * @file ascentprefsvan.cpp
+ * @Ascent Viewer preferences panel
  *
  * $LicenseInfo:firstyear=2008&license=viewergpl$
  * 
  * Copyright (c) 2008, Henri Beauchamp.
+ * Rewritten in its entirety 2010 Hg Beeks. 
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
index f68a75d4d..02b03bd2b 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -108,8 +108,14 @@
 				tool_tip="IM partners will not see '______ is typing...' when you're responding."
 				mouse_opaque="true" name="hide_typing_check" radio_style="false"
 				width="400" />
+			<check_box bottom_delta="-20" control_name="AscentInstantMessageAnnounceIncoming" enabled="true"
+				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+				label="Open IM as soon as user starts typing" left="10"
+				tool_tip="IM window will open as soon as the user begins typing."
+				mouse_opaque="true" name="quickstart_im_check" radio_style="false"
+				width="400" />
 			<!-- Left/Right Column split -->
-			<view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="60"
+			<view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
 						 left="235" name="CmdDivisor" width="0"/>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			    bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -129,7 +135,7 @@
 		    	label="Do not echo/log notifications in chat" left_delta="00"
 			    mouse_opaque="true" name="hide_notifications_in_chat_check" radio_style="false"
 			    width="400" />
-			<check_box bottom="-100" control_name="AscentAllowMUpose" enabled="true"
+			<check_box bottom="-120" control_name="AscentAllowMUpose" enabled="true"
 				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 				label="Allow MU pose method." left="10"
 				tool_tip="Allows the use of both /me and : to perform emotes."