diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 61f8eda9a..50e3693db 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -13,6 +13,130 @@
 		<string />
 	 </array>
 	</map>
+	<key>Responder.Settings</key>
+	<map>
+		<key>Comment</key>
+		<string>New organization to the Auto-Respond settings for keeping clean</string>
+		<key>Persist</key>
+	 	<integer>1</integer>
+		<key>Type</key>
+	 	<string>LLSD</string>
+		<key>Value</key>
+		<map>
+            <key>Message</key>
+			<string>This is an autoresponse!</string>
+		</map>
+	</map>
+	<key>AscentInstantMessageAnnounceIncoming</key>
+	<map>
+	<key>Comment</key>
+		<string>Open a new IM tab when another person begins typing to you and announce that they are doing so.</string>
+	<key>Persist</key>
+		<integer>1</integer>
+	<key>Type</key>
+		<string>Boolean</string>
+	<key>Value</key>
+		<integer>0</integer>
+	</map>
+	<key>AscentInstantMessageResponse</key>
+		<map>
+		<key>Comment</key>
+			<string>Auto response to instant messages</string>
+		<key>Persist</key>
+			<integer>1</integer>
+		<key>Type</key>
+			<string>String</string>
+		<key>Value</key>
+			<string>This is an autoresponse!</string>
+		</map>
+	<key>AscentInstantMessageResponseAnyone</key>
+		<map>
+		<key>Comment</key>
+			<string>Whether to auto-respond to anyone</string>
+		<key>Persist</key>
+			<integer>1</integer>
+		<key>Type</key>
+			<string>Boolean</string>
+		<key>Value</key>
+			<integer>0</integer>
+		</map>
+	<key>AscentInstantMessageResponseFriends</key>
+		<map>
+		<key>Comment</key>
+			<string>Whether to auto-respond to non-friends</string>
+		<key>Persist</key>
+			<integer>1</integer>
+		<key>Type</key>
+			<string>Boolean</string>
+		<key>Value</key>
+			<integer>0</integer>
+		</map>
+	<key>AscentInstantMessageResponseItem</key>
+		<map>
+		<key>Comment</key>
+			<string>Whether to send a item along with the autoresponse</string>
+		<key>Persist</key>
+			<integer>1</integer>
+		<key>Type</key>
+			<string>Boolean</string>
+		<key>Value</key>
+			<integer>0</integer>
+		</map>
+	<key>AscentInstantMessageResponseItemData</key>
+		<map>
+		<key>Comment</key>
+			<string>UUID</string>
+		<key>Persist</key>
+			<integer>1</integer>
+		<key>Type</key>
+			<string>String</string>
+		<key>Value</key>
+			<string></string>
+		</map>
+	<key>AscentInstantMessageResponseMuted</key>
+		<map>
+		<key>Comment</key>
+			<string>Whether to auto-respond to muted people</string>
+		<key>Persist</key>
+			<integer>1</integer>
+		<key>Type</key>
+			<string>Boolean</string>
+		<key>Value</key>
+			<integer>0</integer>
+		</map>
+	<key>AscentInstantMessageResponseRepeat</key>
+		<map>
+		<key>Comment</key>
+			<string>Whether to keep on resending the autoresponse every line they send</string>
+		<key>Persist</key>
+			<integer>1</integer>
+		<key>Type</key>
+			<string>Boolean</string>
+		<key>Value</key>
+			<integer>0</integer>
+		</map>
+	<key>AscentInstantMessageShowOnTyping</key>
+		<map>
+		<key>Comment</key>
+			<string>Whether to perform the autorespond the moment they begin to type instead of waiting for a actual message</string>
+		<key>Persist</key>
+			<integer>1</integer>
+		<key>Type</key>
+			<string>Boolean</string>
+		<key>Value</key>
+			<integer>0</integer>
+		</map>
+	<key>AscentInstantMessageShowResponded</key>
+	<map>
+	<key>Comment</key>
+		<string>Whether to hide IMs entirely from those you have chosen to send autoresponses</string>
+	<key>Persist</key>
+		<integer>1</integer>
+	<key>Type</key>
+		<string>Boolean</string>
+	<key>Value</key>
+		<integer>0</integer>
+	</map>
 	<!-- Ascent Account-Specific (If active) -->
 	<key>AscentFriendColor</key>
     <map>
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index e34678042..a05e080b2 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1477,10 +1477,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	BOOL is_linden = LLMuteList::getInstance()->isLinden(name);
 	BOOL is_owned_by_me = FALSE;
 	
-	// <edit>
-	//chat.mMuted = is_muted && !is_linden;
-	chat.mMuted = is_muted;
-	// </edit>
+	LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id);
+
+	chat.mMuted = is_muted && !is_linden;
 	chat.mFromID = from_id;
 	chat.mFromName = name;
 	chat.mSourceType = (from_id.isNull() || (name == std::string(SYSTEM_FROM))) ? CHAT_SOURCE_SYSTEM : CHAT_SOURCE_AGENT;