Index: src/gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.374
diff -u -p -u -r1.374 gtkconv.c
--- src/gtkconv.c	16 May 2004 06:03:56 -0000	1.374
+++ src/gtkconv.c	17 May 2004 00:46:27 -0000
@@ -4563,9 +4563,9 @@ gaim_gtkconv_write_conv(GaimConversation
 		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));
+		strftime(mdate, sizeof(mdate), "%Y-%m-%d %X", localtime(&mtime));
 	else
-		strftime(mdate, sizeof(mdate), "%H:%M:%S", localtime(&mtime));
+		strftime(mdate, sizeof(mdate), "%X", localtime(&mtime));
 
 	if(gc)
 		sml_attrib = g_strdup_printf("sml=\"%s\"", gc->prpl->info->name);