diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index ac8909bda1..932bc42566 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -340,6 +340,10 @@ public:
 	/*virtual*/ bool		useSpellCheck() const;
 // [/SL:KB]
 
+//<FS:KC - expose ParseHTML setting>
+                void        setParseHTML(bool parse_html) { mParseHTML = parse_html; }
+//</FS:KC - expose ParseHTML setting>
+
 	// used by LLTextSegment layout code
 	bool					getWordWrap() { return mWordWrap; }
 	bool					getUseEllipses() { return mUseEllipses; }
diff --git a/indra/newview/fspanelprofile.cpp b/indra/newview/fspanelprofile.cpp
index 748e24bb27..d8505de62f 100644
--- a/indra/newview/fspanelprofile.cpp
+++ b/indra/newview/fspanelprofile.cpp
@@ -263,7 +263,6 @@ BOOL FSPanelProfile::postBuild()
 
     childSetCommitCallback("add_friend",            boost::bind(&FSPanelProfile::onAddFriendButtonClick, this),NULL);
     childSetCommitCallback("im",                    boost::bind(&FSPanelProfile::onIMButtonClick, this), NULL);
-    childSetCommitCallback("call",                  boost::bind(&FSPanelProfile::onCallButtonClick, this), NULL);
     childSetCommitCallback("teleport",              boost::bind(&FSPanelProfile::onTeleportButtonClick, this), NULL);
     childSetCommitCallback("show_on_map_btn",       boost::bind(&FSPanelProfile::onMapButtonClick, this), NULL);
     childSetCommitCallback("pay",                   boost::bind(&FSPanelProfile::pay, this), NULL);
@@ -307,11 +306,15 @@ void FSPanelProfile::onOpen(const LLSD& key)
 
         LLGroupList* group_list = getChild<LLGroupList>("group_list");
         group_list->enableForAgent();
+
+        getChild<LLTextBase>("sl_description_edit")->setParseHTML(false);
     }
     else
     {
         //Disable "Add Friend" button for friends.
         getChildView("add_friend")->setEnabled(!LLAvatarActions::isFriend(getAvatarId()));
+
+        mVoiceStatus == LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking();
     }
 
     FSDropTarget* target = getChild<FSDropTarget> ("drop_target");