diff --git a/indra/newview/fscontactsfriendsmenu.cpp b/indra/newview/fscontactsfriendsmenu.cpp
index 2a9d5f7a12..eae05aa7f1 100644
--- a/indra/newview/fscontactsfriendsmenu.cpp
+++ b/indra/newview/fscontactsfriendsmenu.cpp
@@ -31,6 +31,7 @@
 
 #include "fsradar.h"
 #include "llavataractions.h"
+#include "lllogchat.h"
 #include "llmenugl.h"
 #include "llslurl.h"
 #include "lluictrlfactory.h"
@@ -49,6 +50,7 @@ LLContextMenu* FSContactsFriendsMenu::createMenu()
 		registrar.add("Contacts.Friends.ShowProfile",			boost::bind(&LLAvatarActions::showProfile,						id));
 		registrar.add("Contacts.Friends.RemoveFriend",			boost::bind(&LLAvatarActions::removeFriendDialog, 				id));
 		registrar.add("Contacts.Friends.SendIM",				boost::bind(&LLAvatarActions::startIM,							id));
+		registrar.add("Contacts.Friends.Calllog",				boost::bind(&LLAvatarActions::viewChatHistory,					id));
 		registrar.add("Contacts.Friends.OfferTeleport",			boost::bind(&FSContactsFriendsMenu::offerTeleport,				this));
 		registrar.add("Contacts.Friends.RequestTeleport",		boost::bind(&LLAvatarActions::teleportRequest,					id));
 		registrar.add("Contacts.Friends.ZoomIn",				boost::bind(&LLAvatarActions::zoomIn,							id));
@@ -124,6 +126,14 @@ bool FSContactsFriendsMenu::enableContextMenuItem(const LLSD& userdata)
 		}
 		return false;
 	}
+	else if (item == std::string("can_callog"))
+	{
+		if (mUUIDs.size() == 1)
+		{
+			return LLLogChat::isTranscriptExist(mUUIDs.front());
+		}
+		return false;
+	}
 	return false;
 }
 
diff --git a/indra/newview/skins/default/xui/de/menu_fs_contacts_friends.xml b/indra/newview/skins/default/xui/de/menu_fs_contacts_friends.xml
index d0e5536814..7d7f5d9c5d 100644
--- a/indra/newview/skins/default/xui/de/menu_fs_contacts_friends.xml
+++ b/indra/newview/skins/default/xui/de/menu_fs_contacts_friends.xml
@@ -2,6 +2,7 @@
 <context_menu name="Friends Popup">
 	<menu_item_call label="Profil anzeigen" name="show_agent"/>
 	<menu_item_call label="IM senden" name="send_im"/>
+	<menu_item_call label="Chatverlauf anzeigen..." name="chat_history"/>
 	<menu_item_call label="Zu Kontakt-Set hinzufügen..." name="Add to Set"/>
 	<menu_item_call label="Zoome auf Freund" name="zoom_agent"/>
 	<menu_item_call label="Zu Freund teleportieren" name="teleportto_agent"/>
diff --git a/indra/newview/skins/default/xui/en/menu_fs_contacts_friends.xml b/indra/newview/skins/default/xui/en/menu_fs_contacts_friends.xml
index d9d9ac73d7..96ef2991e8 100644
--- a/indra/newview/skins/default/xui/en/menu_fs_contacts_friends.xml
+++ b/indra/newview/skins/default/xui/en/menu_fs_contacts_friends.xml
@@ -16,6 +16,16 @@
         <menu_item_call.on_click
          function="Contacts.Friends.SendIM"/>
     </menu_item_call>
+    <menu_item_call
+     label="View chat transcripts..."
+     layout="topleft"
+     name="chat_history">
+        <menu_item_call.on_click
+         function="Contacts.Friends.Calllog"/>
+        <menu_item_call.on_enable
+         function="Contacts.Friends.EnableItem"
+         parameter="can_callog"/>
+    </menu_item_call>
     <menu_item_call
      label="Add to Set..."
      layout="topleft"