diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 95a8d54510..ea4b6dd263 100755
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -4052,6 +4052,10 @@ void LLIMMgr::processIMTypingCore(const LLIMInfo* im_info, BOOL typing)
 			{
 				response = gSavedPerAccountSettings.getString("FSAwayAvatarResponse");
 			}
+			else
+			{
+				LL_WARNS() << "Unknown auto-response mode" << LL_ENDL;
+			}
 			pack_instant_message(
 				gMessageSystem,
 				gAgent.getID(),
@@ -4065,11 +4069,14 @@ void LLIMMgr::processIMTypingCore(const LLIMInfo* im_info, BOOL typing)
 				session_id);
 			gAgent.sendReliableMessage();
 
+			LLStringUtil::format_map_t args;
+			args["MESSAGE"] = response;
+
 			gIMMgr->addMessage(
 				session_id,
 				gAgentID,
 				LLStringUtil::null, // Pass null value so no name gets prepended
-				LLTrans::getString("IM_autoresponse_sent"),
+				LLTrans::getString("IM_autoresponse_sent", args),
 				false,
 				im_info->mName,
 				IM_NOTHING_SPECIAL,
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 2481370230..ac32c557ec 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2960,6 +2960,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
 			// <FS:Ansariel> Old "do not disturb" message behavior: only send once if session not open
 			// Session id will be null if avatar answers from offline IM via email
+			std::string response;
 			if (!gIMMgr->hasSession(session_id) && session_id.notNull())
 			{
 			// </FS:Ansariel>
@@ -2967,7 +2968,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				has_session = false;
 				// <FS:Ansariel> FS autoresponse feature
 				std::string my_name;
-				std::string response;
 				LLAgentUI::buildFullname(my_name);
 				if (is_do_not_disturb)
 				{
@@ -2987,6 +2987,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 					response = gSavedPerAccountSettings.getString("FSAwayAvatarResponse");
 				}
 				// </FS:PP>
+				else
+				{
+					LL_WARNS() << "Unknown auto-response mode" << LL_ENDL;
+				}
 				pack_instant_message(
 					gMessageSystem,
 					gAgent.getID(),
@@ -3056,11 +3060,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			if (!has_session)
 			{
 				// <FS:LO> Fire-5389 - "Autoresponse Sent" message added to Firestorm as was in Phoenix
+				LLStringUtil::format_map_t args;
+				args["MESSAGE"] = response;
+
 				gIMMgr->addMessage(
 					session_id,
 					gAgentID,
 					LLStringUtil::null, // Pass null value so no name gets prepended
-					LLTrans::getString("IM_autoresponse_sent"),
+					LLTrans::getString("IM_autoresponse_sent", args),
 					false,
 					name,
 					IM_NOTHING_SPECIAL,
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index e091c2a31a..606c4a49c6 100755
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -4495,7 +4495,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Ankommende Instant Message von [NAME]
 	</string>
 	<string name="IM_autoresponse_sent">
-		Automatische Antwort gesendet.
+		Automatische Antwort gesendet: [MESSAGE]
 	</string>
 	<string name="IM_autoresponse_item_sent">
 		Objekt für automatische Antwort gesendet: [ITEM_NAME]
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 73b6a1efc7..c53c6b3fef 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2011,7 +2011,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	
 	<!-- Additional IM messages -->
 	<string name="IM_announce_incoming">Incoming message from [NAME]</string>
-	<string name="IM_autoresponse_sent">Autoresponse sent</string>
+	<string name="IM_autoresponse_sent">Autoresponse sent: [MESSAGE]</string>
 	<string name="IM_autoresponse_item_sent">Sent auto-response item: [ITEM_NAME]</string>
 
 	<!-- voice calls -->
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index f48ef15a2e..5e03bbfd2a 100755
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -4323,7 +4323,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 		Mensaje entrante de  [NAME]
 	</string>
 	<string name="IM_autoresponse_sent">
-		Autorrespuesta enviada
+		Autorrespuesta enviada: [MESSAGE]
 	</string>
 	<string name="answered_call">
 		Han respondido a tu llamada
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index a595e52291..15869a6117 100755
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1644,7 +1644,7 @@ Extensions autorisées : .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	<string name="OnlineStatus">connecté</string>
 	<string name="OfflineStatus">déconnecté</string>
 	<string name="IM_announce_incoming">Incoming message from [NAME]</string>
-	<string name="IM_autoresponse_sent">Autoresponse sent</string>
+	<string name="IM_autoresponse_sent">Autoresponse sent: [MESSAGE]</string>
 	<string name="IM_autoresponse_item_sent">Sent auto-response item: [ITEM_NAME]</string>
 	<string name="answered_call">Your call has been answered</string>
 	<string name="you_started_call">You started a voice call</string>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 99db275ca3..09c4c57083 100755
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -4331,7 +4331,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 		Nadchodzi wiadomość od [NAME]
 	</string>
 	<string name="IM_autoresponse_sent">
-		Autoodpowiedź wysłana
+		Autoodpowiedź wysłana: [MESSAGE]
 	</string>
 	<string name="IM_autoresponse_item_sent">
 		Wysłano przedmiot: [ITEM_NAME]
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 785a651954..ac0e829992 100755
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -4506,7 +4506,7 @@ support@secondlife.com.
 		Входящее сообщение от [NAME]
 	</string>
 	<string name="IM_autoresponse_sent">
-		Автоответ отправлен
+		Автоответ отправлен: [MESSAGE]
 	</string>
 	<string name="IM_autoresponse_item_sent">
 		Элемент [ITEM_NAME] отправлен автоответом