Index: mail/em-format-html.c
===================================================================
--- mail/em-format-html.c	(revision 35877)
+++ mail/em-format-html.c	(working copy)
@@ -1868,7 +1868,7 @@
 			GString *html;
 
 			if (!(addrs = camel_header_address_decode (header->value, hdr_charset)))
-				return;
+				break;
 
 			html = g_string_new("");
 			name = efh_format_address(efh, html, addrs, header->name);
@@ -1883,7 +1883,7 @@
 			GString *html;
 
 			if (!(addrs = camel_header_address_decode (header->value, hdr_charset)))
-				return;
+				break;
 
 			html = g_string_new("");
 			name = efh_format_address(efh, html, addrs, header->name);
Index: mail/ChangeLog
===================================================================
--- mail/ChangeLog	(revision 35877)
+++ mail/ChangeLog	(working copy)
@@ -1,3 +1,11 @@
+2008-08-01  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fixes bug #537088
+
+	* em-format-html.c: (efh_format_headers): Break out of the loop rather
+	that return from this function when running into an empty From: or
+	Sender: header.
+
 2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #545820
