diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 19a0fb4ab..68fe354d7 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2323,12 +2323,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		return;
 	// NaCl End
 
-	// Singu TODO: LLIMProcessing goes here
-	if (chat.mSourceType == CHAT_SOURCE_SYSTEM)
-	{ // Translate server message if required (MAINT-6109)
-		translate_if_needed(message);
-	}
-
 	// make sure that we don't have an empty or all-whitespace name
 	LLStringUtil::trim(name);
 	if (name.empty())
@@ -2368,6 +2362,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		args["NAME"] = name;
 	}
 
+	// Singu TODO: LLIMProcessing goes here
+	if (chat.mSourceType == CHAT_SOURCE_SYSTEM)
+	{ // Translate server message if required (MAINT-6109)
+		translate_if_needed(message);
+	}
+
 	LLViewerObject *source = gObjectList.findObject(session_id); //Session ID is probably the wrong thing.
 	if (source || (source = gObjectList.findObject(from_id)))
 	{