diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b2f233f70..d268b43e6 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -674,10 +674,21 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LiruGroupNoticeTimes</key>
+    <map>
+      <key>Comment</key>
+      <string>Append timestamp to date in the lists of past group notices</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <boolean>0</boolean>
+    </map>
     <key>LiruItalicizeActions</key>
     <map>
       <key>Comment</key>
-	  <string>When enabled, /me chat will be italicized.</string>
+      <string>When enabled, /me chat will be italicized.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index 87e237369..001a1179a 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -477,7 +477,10 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
 		row["columns"][2]["value"] = name;
 
 		std::string buffer;
-		timeToFormattedString(t, gSavedSettings.getString("ShortDateFormat"), buffer);
+		std::string format(gSavedSettings.getString("ShortDateFormat"));
+		if (gSavedSettings.getBOOL("LiruGroupNoticeTimes"))
+			format += " " + gSavedSettings.getString("ShortTimeFormat");
+		timeToFormattedString(t, format, buffer);
 		row["columns"][3]["column"] = "date";
 		row["columns"][3]["value"] = buffer;