1 files changed, 5 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index ec6d4d4..bfd1045 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2316,8 +2316,11 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                 std::string group_name;
                 if (gAgent.isInGroup(session_id) && gSavedSettings.getBOOL("ShowGroupNameInChatIM"))
                 {
-                        group_name = std::string((char*)binary_bucket);
-                        chat.mText = std::string("[") + group_name + std::string("] ") + name 
+                        if (!(gCacheName->getGroupName(from_id, group_name)))
+                        {
+                                group_name = std::string((char*)binary_bucket);
+                        }
+                        chat.mText = std::string("IM [") + group_name + std::string("] ") + name 
                                                 + separator_string + saved + message.substr(message_offset);
                 }
                 else