diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp
index 4407d5aafe..f4b641af30 100644
--- a/indra/newview/fschathistory.cpp
+++ b/indra/newview/fschathistory.cpp
@@ -88,11 +88,11 @@ std::string prefixIM(std::string from, const LLChat& chat)
 {
 	if (chat.mChatType == CHAT_TYPE_IM)
 	{
-		from = LLTrans::getString("IMPrefix") + from;
+		from = LLTrans::getString("IMPrefix") + " " + from;
 	}
 	else if (chat.mChatType == CHAT_TYPE_IM_GROUP)
 	{
-		from = LLTrans::getString("IMPrefix") + chat.mFromNameGroup + from;
+		from = LLTrans::getString("IMPrefix") + " " + chat.mFromNameGroup + from;
 	}
 	
 	return from;
@@ -661,7 +661,7 @@ private:
 		mFrom = "";
 		if (chat_type == CHAT_TYPE_IM || chat_type == CHAT_TYPE_IM_GROUP)
 		{
-			mFrom = LLTrans::getString("IMPrefix");
+			mFrom = LLTrans::getString("IMPrefix") + " ";
 			if(!group.empty())
 			{
 				mFrom.append(group);
@@ -1116,7 +1116,7 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 
 		mLastFromName = chat.mFromName;
 		
-		//if (chat.mChatType == CHAT_TYPE_IM) mLastFromName = LLTrans::getString("IMPrefix") + mLastFromName;
+		//if (chat.mChatType == CHAT_TYPE_IM) mLastFromName = LLTrans::getString("IMPrefix") + " " + mLastFromName;
 		mLastFromName = prefixIM(mLastFromName, chat);
 		mLastFromID = chat.mFromID;
 		mLastMessageTime = new_message_time;
diff --git a/indra/newview/fsconsoleutils.cpp b/indra/newview/fsconsoleutils.cpp
index 0c3984eb9e..bde57db6a1 100644
--- a/indra/newview/fsconsoleutils.cpp
+++ b/indra/newview/fsconsoleutils.cpp
@@ -283,6 +283,6 @@ void FSConsoleUtils::onProccessInstantMessageNameLookup(const LLUUID& agent_id,
 		textColor = LGGContactSets::getInstance()->getFriendColor(agent_id);
 	}
 
-	gConsole->addConsoleLine(LLTrans::getString("IMPrefix") + senderName + delimiter + message, textColor);
+	gConsole->addConsoleLine("IM: " + senderName + delimiter + message, textColor);
 	gConsole->setVisible(!isNearbyChatVisible());
 }
diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index d49e7a0ad3..07905add53 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -293,13 +293,14 @@ void FSFloaterNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD
 			{
 				if (gSavedSettings.getBOOL("FSLogIMInChatHistory"))
 				{
+					//from_name = "IM: " + from_name;
 					if (chat.mChatType == CHAT_TYPE_IM_GROUP && chat.mFromNameGroup != "")
 					{
-						from_name = LLTrans::getString("IMPrefix") + chat.mFromNameGroup + from_name;
+						from_name = "IM: " + chat.mFromNameGroup + from_name;
 					}
 					else
 					{
-						from_name = LLTrans::getString("IMPrefix") + from_name;
+						from_name = "IM: " + from_name;
 					}
 					// FS:LO FIRE-5230 - Chat Console Improvement: Replacing the "IM" in front of group chat messages with the actual group name
 				}
@@ -599,7 +600,7 @@ void FSFloaterNearbyChat::loadHistory()
 			// Ansariel: Strip IM prefix so we can properly
 			//           retrieve the UUID in case we got a
 			//           saved IM in nearby chat history.
-			std::string im_prefix = LLTrans::getString("IMPrefix");
+			std::string im_prefix = "IM: ";
 			size_t im_prefix_found = from.find(im_prefix);
 			if (im_prefix_found != std::string::npos)
 			{
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index a54badb683..e790ad6453 100755
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -797,7 +797,7 @@ bool LLChatLogParser::parse(std::string& raw, LLSD& im, const LLSD& parse_params
 	std::string name = name_and_text[IDX_NAME];
 
 	// Ansariel: Handle the case an IM was stored in nearby chat history
-	if (name == LLTrans::getString("IMPrefix"))
+	if (name == "IM:")
 	{
 		U32 divider_pos = stuff.find(NAME_TEXT_DIVIDER, 3);
 		if (divider_pos != std::string::npos && divider_pos < (stuff.length() - NAME_TEXT_DIVIDER.length()))
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index adf9717cf2..a2d606283f 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2409,7 +2409,7 @@ Try enclosing path to the editor with double quotes.
   <string name="snapshot_quality_medium">Medium</string>
   <string name="snapshot_quality_high">High</string>
   <string name="snapshot_quality_very_high">Very High</string>
-  <string name="IMPrefix">IM: </string>
+  <string name="IMPrefix">IM:</string>
 
   <!-- Settings sanity checks -->
   <string name="SanityCheckEquals">The settings control &quot;[CONTROL_NAME]&quot; should be at [VALUE_1].</string>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index a6d60792ec..8dd0e285b8 100755
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -5357,7 +5357,7 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 		No hay conversaciones guardadas. Después de contactar con un residente o de que alguien contacte contigo, se mostrará aquí una entrada de registro.
 	</string>
 	<string name="IMPrefix">
-		MI: 
+		MI:
 	</string>
 	<string name="SanityCheckEquals">
 		La configuración de &quot;[CONTROL_NAME]&quot; debería establecerse a [VALUE_1].