From 020e16efd96e0b474364cd66dfe963891d503b7c Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 26 Apr 2010 18:07:54 +0200
Subject: Use default headers when none stored to display in mailer

As part of bug #603418, to fix a corner	case
---
 mail/e-mail-reader-utils.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'mail')

diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index ab72b364c7..addc126285 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -699,8 +699,11 @@ headers_changed_cb (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMailR
 		e_mail_reader_header_free (h);
 	}
 
-	g_slist_foreach(header_config_list, (GFunc) g_free, NULL);
-	g_slist_free(header_config_list);
+	if (!header_config_list)
+		em_format_default_headers (emf);
+
+	g_slist_foreach (header_config_list, (GFunc) g_free, NULL);
+	g_slist_free (header_config_list);
 
 	/* force a redraw */
 	if (emf->message)
-- 
cgit