diff --git a/indra/llcommon/llformat.cpp b/indra/llcommon/llformat.cpp
index 345d3a4feb206967a7485dca51b91818f394d73b..10508d28e0f01c9988065551bbccb9b7c3c8d9eb 100755
--- a/indra/llcommon/llformat.cpp
+++ b/indra/llcommon/llformat.cpp
@@ -29,14 +29,12 @@
 
 #include "llformat.h"
 
-#include <cstdarg>
-
 // common used function with va_list argument
 // wrapper for vsnprintf to be called from llformatXXX functions.
 static void va_format(std::string& out, const char *fmt, va_list va)
 {
-	char tstr[8096];	/* Flawfinder: ignore */
-	vsnprintf(tstr, 8096, fmt, va);	/* Flawfinder: ignore */
+	char tstr[2048];	/* Flawfinder: ignore */
+	std::vsnprintf(tstr, 2048, fmt, va);	/* Flawfinder: ignore */
 	out.assign(tstr);
 }
 
diff --git a/indra/newview/lleasymessagereader.cpp b/indra/newview/lleasymessagereader.cpp
index 1d616d0c84aa837d6136cc9c26a45d8d79b88336..3635dae3bfe4db1fb7de41f676e715b77c236080 100644
--- a/indra/newview/lleasymessagereader.cpp
+++ b/indra/newview/lleasymessagereader.cpp
@@ -28,6 +28,7 @@
 #include <libxml/HTMLtree.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/format.hpp>
 
 //I doubt any of this is thread safe!
 LLEasyMessageLogEntry::LLEasyMessageLogEntry(LogPayload entry, LLEasyMessageReader* message_reader)
@@ -130,7 +131,7 @@ std::string LLEasyMessageLogEntry::getFull(BOOL beautify, BOOL show_header)
 			if(temp)
 			{
 				full << (isOutgoing() ? "out " : "in ");
-				full << llformat("%s\n\n", temp->mName);
+				full << (boost::format("%s\n\n") % temp->mName);
 				if(show_header)
 				{
 					full << "[Header]\n";