diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 29f6693089..c382a4e0a3 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -82,7 +82,8 @@ const static std::string MULTI_LINE_PREFIX(" ");
  *
  * Note: "You" was used as an avatar names in viewers of previous versions
  */
-const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}\\]\\s+)?(.*)$");
+//const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}\\]\\s+)?(.*)$");
+const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}:\\d{2}\\]\\s+)?(.*)$");
 
 /**
  *  Regular expression suitable to match names like
@@ -104,8 +105,8 @@ const static boost::regex OUTBOUND_CONFERENCE("^Ad-hoc Conference hash[a-f0-9]{8
 const static std::string NAME_TEXT_DIVIDER(": ");
 
 // is used for timestamps adjusting
-const static char* DATE_FORMAT("%Y/%m/%d %H:%M");
-const static char* TIME_FORMAT("%H:%M");
+const static char* DATE_FORMAT("%Y/%m/%d %H:%M:%S");
+const static char* TIME_FORMAT("%H:%M:%S");
 
 const static int IDX_TIMESTAMP = 1;
 const static int IDX_STUFF = 2;
@@ -254,12 +255,14 @@ std::string LLLogChat::timestamp(bool withdate)
 		          +LLTrans::getString ("TimeMonth")+"]/["
 				  +LLTrans::getString ("TimeDay")+"] ["
 				  +LLTrans::getString ("TimeHour")+"]:["
-				  +LLTrans::getString ("TimeMin")+"]";
+				  +LLTrans::getString ("TimeMin")+"]:["
+				  +LLTrans::getString ("TimeSec")+"]";
 	}
 	else
 	{
 		timeStr = "[" + LLTrans::getString("TimeHour") + "]:["
-			      + LLTrans::getString ("TimeMin")+"]";
+				  + LLTrans::getString ("TimeMin")+"]:["
+			      + LLTrans::getString ("TimeSec")+"]";
 	}
 
 	LLStringUtil::format (timeStr, substitution);
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index f4376c3b4d..7b8f7b62f3 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -221,7 +221,8 @@ std::string appendTime()
 	time_t utc_time;
 	utc_time = time_corrected();
 	std::string timeStr ="["+ LLTrans::getString("TimeHour")+"]:["
-		+LLTrans::getString("TimeMin")+"]";
+		+LLTrans::getString("TimeMin")+"]:["
+		+LLTrans::getString("TimeSec")+"]";
 
 	LLSD substitution;
 
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml
index bbdebd1d21..772437b739 100644
--- a/indra/newview/skins/default/xui/en/language_settings.xml
+++ b/indra/newview/skins/default/xui/en/language_settings.xml
@@ -34,7 +34,8 @@
 	-->
 
 	<string name="TimeHour">hour,datetime,slt</string>
-	<string name="TimeMin">min,datetime,slt</string>	
+	<string name="TimeMin">min,datetime,slt</string>
+	<string name="TimeSec">second,datetime,slt</string>
 	<string name="TimeYear">year,datetime,slt</string>	
 	<string name="TimeDay">day,datetime,slt</string>	
 	<string name="TimeMonth">mthnum,datetime,slt</string>