diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp
index 75d2341ed8..3bd05cd86d 100644
--- a/indra/newview/llfloaterconversationpreview.cpp
+++ b/indra/newview/llfloaterconversationpreview.cpp
@@ -102,11 +102,15 @@ BOOL LLFloaterConversationPreview::postBuild()
 		file = "chat";
 	}
 	mChatHistoryFileName = file;
-	// <FS:Ansariel> Obsolete because of https://bitbucket.org/lindenlab/viewer/commits/57b32eb01cd35bbac440569df885036eb24f2369
-	//if (mIsGroup && !LLStringUtil::endsWith(mChatHistoryFileName, GROUP_CHAT_SUFFIX))
-	//{
-	//	mChatHistoryFileName += GROUP_CHAT_SUFFIX;
-	//}
+	// <FS:Ansariel> Broken version got removed in https://bitbucket.org/lindenlab/viewer/commits/57b32eb01cd35bbac440569df885036eb24f2369
+	//               but this is actually needed in the fixed form: If a group chat
+	//               log is stored in conversation.log without the suffix, the filename
+	//               will not be updated until the conversation is removed from the log,
+	//               resulting in the old chat log being displayed.
+	if (mIsGroup && !LLStringUtil::endsWith(mChatHistoryFileName, GROUP_CHAT_SUFFIX))
+	{
+		mChatHistoryFileName += GROUP_CHAT_SUFFIX;
+	}
 	// </FS:Ansariel>
 	LLStringUtil::format_map_t args;
 	args["[NAME]"] = name;