diff -r fb910d97fe29 -r 6210ee4beccc pidgin/plugins/timestamp_format.c
--- a/pidgin/plugins/timestamp_format.c	Mon Feb 05 03:37:35 2007 +0000
+++ b/pidgin/plugins/timestamp_format.c	Mon Feb 05 05:28:54 2007 +0000
@@ -57,12 +57,11 @@
                                  gboolean force,
                                  const char *dates)
 {
-	g_return_val_if_fail(conv != NULL, NULL);
 	g_return_val_if_fail(dates != NULL, NULL);
 
 	if (show_date ||
 	    !strcmp(dates, "always") ||
-	    (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT && !strcmp(dates, "chats")))
+	    (conv != NULL && gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT && !strcmp(dates, "chats")))
 	{
 		struct tm *tm = localtime(&t);
 		if (force)