X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view-render.c;h=c5384ca32fc5cbad2ad02b5c6b98772d79450657;hb=d144f67aad71f1e437e9f3279de827f03078e346;hp=b3bcbdba8f20065061c4bcbe9e70b218b55a90f6;hpb=475fd5f7e8a2823a7593baa60e1982a24f628888;p=modest

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index b3bcbdb..c5384ca 100644
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -246,23 +246,28 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 	header = g_markup_printf_escaped ("%s", (subject && strlen (subject)) ? subject : _("mail_va_no_subject"));
 	g_free (subject);
 	g_object_set (G_OBJECT (subject_cell), "markup", header, NULL);
+	g_free (header);
 	set_common_flags (subject_cell, flags);
-
+	
 	header = g_markup_printf_escaped ("<small>%s</small>", modest_text_utils_get_display_address (address));
 	g_free (address);
 	g_object_set (G_OBJECT (recipient_cell), "markup", header, NULL);
-
-	g_object_set (G_OBJECT (recipient_cell), "markup", header, NULL);	
+	g_free (header);
 	set_common_flags (recipient_cell, flags);
 
-	tmp_date = modest_text_utils_get_display_date (date);
+	/* in some rare cases, mail might have no Date: field. it case,
+	 * don't show the date, instead of bogus 1/1/1970
+	 */
+	if (date)
+		tmp_date = modest_text_utils_get_display_date (date);
+	else
+		tmp_date = g_strdup ("");
+	
 	display_date = g_strdup_printf ("<small>%s</small>", tmp_date);
 	g_object_set (G_OBJECT (date_cell), "markup", display_date, NULL);
 	g_free (tmp_date);
 	g_free (display_date);
 	set_common_flags (date_cell, flags);
-	
-	g_free (header);
 }