diff -r 4982ab91ef6a -r a034f5333cba doc/contributions.txt
--- a/doc/contributions.txt	Mon Jan 09 08:41:36 2012 -0500
+++ b/doc/contributions.txt	Mon Jan 23 17:43:05 2012 -0500
@@ -607,6 +607,7 @@
 	STORM-1737
 	STORM-1733
 	STORM-1790
+	STORM-1795
 Kadah Coba
 	STORM-1060
 Jondan Lundquist
diff -r 4982ab91ef6a -r a034f5333cba indra/newview/llimview.cpp
--- a/indra/newview/llimview.cpp	Mon Jan 09 08:41:36 2012 -0500
+++ b/indra/newview/llimview.cpp	Mon Jan 23 17:43:05 2012 -0500
@@ -2458,7 +2458,10 @@
 		make_ui_sound("UISndNewIncomingIMSession");
 	}
 
-	if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat))
+	bool skip_message = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") &&
+		LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL);
+
+	if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message)
 	{
 		LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg);
 	}