Index: src/gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.705
diff -u -d -p -r1.705 gtkconv.c
--- src/gtkconv.c	21 Dec 2005 21:48:38 -0000	1.705
+++ src/gtkconv.c	22 Dec 2005 05:47:52 -0000
@@ -4421,7 +4421,8 @@ gaim_gtkconv_write_conv(GaimConversation
 	if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml))))
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", gtk_font_options_all);
 
-	if(time(NULL) > mtime + 20*60) /* show date if older than 20 minutes */
+	if(gaim_prefs_get_bool("/gaim/gtk/conversations/include_date_timestamps")
+		|| time(NULL) > mtime + 20*60) /* show date if older than 20 minutes */
 		strftime(mdate, sizeof(mdate), "%Y-%m-%d %H:%M:%S", localtime(&mtime));
 	else
 		strftime(mdate, sizeof(mdate), "%H:%M:%S", localtime(&mtime));
@@ -5971,6 +5972,7 @@ gaim_gtk_conversations_init(void)
 	/* Conversations */
 	gaim_prefs_add_none("/gaim/gtk/conversations");
 	gaim_prefs_add_bool("/gaim/gtk/conversations/use_smooth_scrolling", TRUE);
+	gaim_prefs_add_bool("/gaim/gtk/conversations/include_date_timestamps", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/close_on_tabs", TRUE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/send_bold", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/send_italic", FALSE);
Index: src/gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.316
diff -u -d -p -r1.316 gtkprefs.c
--- src/gtkprefs.c	21 Dec 2005 18:36:11 -0000	1.316
+++ src/gtkprefs.c	22 Dec 2005 05:47:52 -0000
@@ -841,6 +841,7 @@ conv_page()
 #endif
 
 	gaim_gtk_prefs_checkbox(_("Use smooth-scrolling"), "/gaim/gtk/conversations/use_smooth_scrolling", vbox);
+	gaim_gtk_prefs_checkbox(_("Include _date in timestamps"), "/gaim/gtk/conversations/include_date_timestamps", vbox);
 
 	frame = gaim_gtk_create_imhtml(TRUE, &imhtml, &toolbar);
 	gtk_widget_set_name(imhtml, "gaim_gtkprefs_font_imhtml");
Index: src/log.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/log.c,v
retrieving revision 1.130
diff -u -d -p -r1.130 log.c
--- src/log.c	20 Dec 2005 06:43:53 -0000	1.130
+++ src/log.c	22 Dec 2005 05:47:52 -0000
@@ -803,7 +803,11 @@ static void xml_logger_write(GaimLog *lo
 	if(!data->file)
 		return;
 
-	strftime(date, sizeof(date), "%H:%M:%S", localtime(&time));
+	if (gaim_prefs_get_bool("/gaim/gtk/conversations/include_date_timestamps"))
+		strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&time));
+	else
+		strftime(date, sizeof(date), "%H:%M:%S", localtime(&time));
+
 	gaim_markup_html_to_xhtml(message, &xhtml, NULL);
 	if (from)
 		fprintf(log->logger_data, "<message %s %s from='%s' time='%s'>%s</message>\n",
@@ -893,7 +897,11 @@ static void html_logger_write(GaimLog *l
 		strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&time));
 		fprintf(data->file, "---- %s @ %s ----<br/>\n", msg_fixed, date);
 	} else {
-		strftime(date, sizeof(date), "%H:%M:%S", localtime(&time));
+		if (gaim_prefs_get_bool("/gaim/gtk/conversations/include_date_timestamps"))
+			strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&time));
+		else
+			strftime(date, sizeof(date), "%H:%M:%S", localtime(&time));
+
 		if (type & GAIM_MESSAGE_SYSTEM)
 			fprintf(data->file, "<font size=\"2\">(%s)</font><b> %s</b><br/>\n", date, msg_fixed);
 		else if (type & GAIM_MESSAGE_WHISPER)
@@ -1012,7 +1020,11 @@ static void txt_logger_write(GaimLog *lo
  		strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&time));
  		fprintf(data->file, "---- %s @ %s ----\n", stripped, date);
  	} else {
- 		strftime(date, sizeof(date), "%H:%M:%S", localtime(&time));
+		if (gaim_prefs_get_bool("/gaim/gtk/conversations/include_date_timestamps"))
+			strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&time));
+		else
+ 			strftime(date, sizeof(date), "%H:%M:%S", localtime(&time));
+
  		if (type & GAIM_MESSAGE_SEND ||
  			type & GAIM_MESSAGE_RECV) {
  			if (type & GAIM_MESSAGE_AUTO_RESP) {