diff options
Diffstat (limited to 'mail/em-format-html.c')
| -rw-r--r-- | mail/em-format-html.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 3ad759bfef..8aed5e814c 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1891,22 +1891,23 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) g_free(name); } else if (!g_ascii_strcasecmp (header->name, "X-Evolution-Mail-From-Delegate")) { mail_from_delegate = TRUE; - } else if (header_sender && header_from && mail_from_delegate) { - camel_stream_printf(stream, "<tr><td><table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>"); - if(gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) - camel_stream_printf (stream, "<td align=\"right\" width=\"100%%\">"); - else - camel_stream_printf (stream, "<td align=\"left\" width=\"100%%\">"); - /* To translators: This message suggests to the receipients that the sender of the mail is - different from the one listed in From field. - */ - camel_stream_printf(stream, _("This message was sent by <b>%s</b> on behalf of <b>%s</b>"), header_sender, header_from); - camel_stream_printf(stream, "</td></tr></table></td></tr>"); - break; } header = header->next; } + + if (header_sender && header_from && mail_from_delegate) { + camel_stream_printf(stream, "<tr><td><table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>"); + if(gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) + camel_stream_printf (stream, "<td align=\"right\" width=\"100%%\">"); + else + camel_stream_printf (stream, "<td align=\"left\" width=\"100%%\">"); + /* To translators: This message suggests to the receipients that the sender of the mail is + different from the one listed in From field. + */ + camel_stream_printf(stream, _("This message was sent by <b>%s</b> on behalf of <b>%s</b>"), header_sender, header_from); + camel_stream_printf(stream, "</td></tr></table></td></tr>"); + } g_free (header_sender); g_free (header_from); @@ -1918,7 +1919,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) /* dump selected headers */ h = (EMFormatHeader *)emf->header_list.head; - if (h->next == NULL || emf->mode == EM_FORMAT_ALLHEADERS) { + if (emf->mode == EM_FORMAT_ALLHEADERS) { header = ((CamelMimePart *)part)->headers; while (header) { efh_format_header(emf, stream, part, header, EM_FORMAT_HTML_HEADER_NOCOLUMNS, charset); |