diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp
index 62d3ebd7e..084cc448f 100644
--- a/indra/newview/ascentprefschat.cpp
+++ b/indra/newview/ascentprefschat.cpp
@@ -140,15 +140,19 @@ void setTimeDateFormats(const S8& tempTimeFormat, const S8& tempDateFormat)
 		{
 			short_time = "%R";
 			long_time  = "%T";
-			timestamp += " %T";
+			if (!timestamp.empty()) timestamp += " %T";
 		}
 		else
 		{
 			short_time = "%I:%M %p";
 			long_time  = "%I:%M:%S %p";
-			timestamp += " %I:%M %p";
+			if (!timestamp.empty()) timestamp += " %I:%M %p";
 		}
 	}
+	else if (!timestamp.empty())
+	{
+		timestamp += ' ' + gSavedSettings.getString("ShortTimeFormat");
+	}
 
 	if (!short_date.empty())
 	{