diff --git a/indra/newview/llavatariconctrl.h b/indra/newview/llavatariconctrl.h
index 426fcec5141b96532473ddd8f96d3a715bd73427..65b5c86ed54302a26fc203f113642d46fcd6cf33 100644
--- a/indra/newview/llavatariconctrl.h
+++ b/indra/newview/llavatariconctrl.h
@@ -103,6 +103,8 @@ class LLAvatarIconCtrl
 	const std::string&	getFirstName() const { return mFirstName; }
 	const std::string&	getLastName() const { return mLastName; }
 
+	void setDrawTooltip(bool value) { mDrawTooltip = value;}
+
 protected:
 	LLUUID				mAvatarId;
 	std::string			mFirstName;
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index f6cf61a13a3e06a0ea1c201a8afc50947e7fea87..512773d215d29a25da1188071ddafc2d1a109c68 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -159,6 +159,7 @@ class LLChatHistoryHeader: public LLPanel
 			mSourceType = CHAT_SOURCE_SYSTEM;
 		}
 
+
 		LLTextBox* userName = getChild<LLTextBox>("user_name");
 		
 		if(!chat.mFromName.empty())
@@ -174,18 +175,14 @@ class LLChatHistoryHeader: public LLPanel
 
 		LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon");
 
+		if(mSourceType != CHAT_SOURCE_AGENT)
+			icon->setDrawTooltip(false);
 
 		if(!chat.mFromID.isNull())
 		{
 			icon->setValue(chat.mFromID);
 		}
-		else
-		{
 
-		}
-
-		if(mSourceType != CHAT_SOURCE_AGENT)
-			icon->setToolTip(std::string(""));
 	} 
 
 	void nameUpdatedCallback(const LLUUID& id,const std::string& first,const std::string& last,BOOL is_group)