diff -ru ../old/gaim-1.5.0/src/gtkconv.c src/gtkconv.c
--- ../old/gaim-1.5.0/src/gtkconv.c	2005-07-22 00:12:01.000000000 -0700
+++ src/gtkconv.c	2005-08-30 10:42:17.955292800 -0700
@@ -5182,10 +5182,7 @@
 	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>", 0);
 
-	if(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));
+	strftime(mdate, sizeof(mdate), "%Y-%m-%d %H:%M:%S", localtime(&mtime));
 
 	if(gc)
 		sml_attrib = g_strdup_printf("sml=\"%s\"",
diff -ru ../old/gaim-1.5.0/src/gtkdebug.c src/gtkdebug.c
--- ../old/gaim-1.5.0/src/gtkdebug.c	2005-02-09 16:07:18.000000000 -0800
+++ src/gtkdebug.c	2005-08-30 10:44:53.769342400 -0700
@@ -471,7 +471,8 @@
 			gchar mdate[64];
 			time_t mtime = time(NULL);
 
-			strftime(mdate, sizeof(mdate), "%H:%M:%S", localtime(&mtime));
+			strftime(mdate, sizeof(mdate), "%Y-%m-%d %H:%M:%S",
+				localtime(&mtime));
 
 			ts_s = g_strdup_printf("(%s) ", mdate);
 		}
diff -ru ../old/gaim-1.5.0/src/log.c src/log.c
--- ../old/gaim-1.5.0/src/log.c	2005-07-11 21:27:41.000000000 -0700
+++ src/log.c	2005-08-30 10:48:11.814116800 -0700
@@ -509,7 +509,7 @@
 	if(!data->file)
 		return;
 
-	strftime(date, sizeof(date), "%H:%M:%S", localtime(&time));
+	strftime(date, sizeof(date), "%Y-%m-%d %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",
@@ -599,7 +599,7 @@
 		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));
+		strftime(date, sizeof(date), "%Y-%m-%d %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)
@@ -731,7 +731,7 @@
  		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));
+ 		strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&time));
  		if (type & GAIM_MESSAGE_SEND ||
  			type & GAIM_MESSAGE_RECV) {
  			if (type & GAIM_MESSAGE_AUTO_RESP) {
diff -ru ../old/gaim-1.5.0/src/util.c src/util.c
--- ../old/gaim-1.5.0/src/util.c	2005-08-11 17:53:33.000000000 -0700
+++ src/util.c	2005-08-30 10:37:22.880996800 -0700
@@ -468,7 +468,7 @@
 	time_t tme;
 
 	time(&tme);
-	strftime(date, sizeof(date), "%H:%M:%S", localtime(&tme));
+	strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&tme));
 
 	return date;
 }