-
- /* deal with empty subjects */
- if (!subject)
- subject = g_strdup (_("mail_va_no_subject"));
-
- /* Escape special characteres to allow pango makup`*/
- display_address = modest_text_utils_get_display_address (address);
- parsed_address = modest_text_utils_convert_to_pango (display_address);
- //_pango_parse_string (display_address);
- parsed_subject = modest_text_utils_convert_to_pango (subject);
- //_pango_parse_string (subject);
-
- header = g_strdup_printf ("%s\n<small>%s</small>",
- parsed_subject,
- parsed_address);
+ header = g_markup_printf_escaped ("%s\n<small>%s</small>",
+ subject ? subject : _("mail_va_no_subject"),
+ address);