diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index 5fa05c26ce..8322027918 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -298,7 +298,14 @@ void FSFloaterNearbyChat::onNearbySpeakers()
 // static
 void FSFloaterNearbyChat::onHistoryButtonClicked(LLUICtrl* ctrl, void* userdata)
 {
-	gViewerWindow->getWindow()->openFile(LLLogChat::makeLogFileName("chat"));
+	if (gSavedSettings.getBOOL("FSUseBuiltInHistory"))
+	{
+		LLFloaterReg::showInstance("preview_conversation", LLSD(LLUUID::null), true);
+	}
+	else
+	{
+		gViewerWindow->getWindow()->openFile(LLLogChat::makeLogFileName("chat"));
+	}
 }
 
 void FSFloaterNearbyChat::onNearbyChatContextMenuItemClicked(const LLSD& userdata)