diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp
index 8da302378a..01681486d2 100644
--- a/indra/newview/fsfloaterim.cpp
+++ b/indra/newview/fsfloaterim.cpp
@@ -450,12 +450,17 @@ void FSFloaterIM::sendMsgFromInputEditor(EChatType type)
 					size_t insert_pos = is_irc_me_prefix(utf8_text) ? 4 : 0;
 					
 					//For testing/beta groups, we display the build version since it doesn't speed by and this might change often
-					if(chat_prefix_testing && FSData::getInstance()->isTestingGroup(mSessionID))
-						utf8_text.insert(insert_pos, ("(" + str_address_size_tag + str_operating_system_tag + " " + LLVersionInfo::getBuildVersion() + skin_indicator + str_viewer_mode + str_rlv_enabled + str_opensim_tag + ") "));
-					
+					if(FSData::getInstance()->isTestingGroup(mSessionID))
+					{
+						if(chat_prefix_testing)
+							utf8_text.insert(insert_pos, ("(" + str_address_size_tag + str_operating_system_tag + " " + LLVersionInfo::getBuildVersion() + skin_indicator + str_viewer_mode + str_rlv_enabled + str_opensim_tag + ") "));
+					}
 					//For release support groups, only display the short version(Major.Minor.Patch) since chat can speed by. This makes it easier on Support's eyes.
-					else if(chat_prefix_support && FSData::getInstance()->isSupportGroup(mSessionID))
-						utf8_text.insert(insert_pos, ("(" + str_address_size_tag + str_operating_system_tag + " " + LLVersionInfo::getShortVersion() + skin_indicator + str_viewer_mode + str_rlv_enabled + str_opensim_tag + ") "));
+					else if(FSData::getInstance()->isSupportGroup(mSessionID))
+					{
+						if(chat_prefix_support)
+							utf8_text.insert(insert_pos, ("(" + str_address_size_tag + str_operating_system_tag + " " + LLVersionInfo::getShortVersion() + skin_indicator + str_viewer_mode + str_rlv_enabled + str_opensim_tag + ") "));
+					}
 				}
 				
 				// <FS:Techwolf Lupindo> Allow user to send system info.