- else
- file_icon_name =
- modest_platform_get_file_icon_name (
- NULL, tny_mime_part_get_content_type (mime_part), NULL);
+ } else {
+ gchar *header_content_type;
+ header_content_type = modest_tny_mime_part_get_content_type (mime_part);
+ if ((g_str_has_prefix (header_content_type, "message/rfc822") ||
+ g_str_has_prefix (header_content_type, "multipart/") ||
+ g_str_has_prefix (header_content_type, "text/"))) {
+ file_icon_name =
+ modest_platform_get_file_icon_name (
+ NULL, tny_mime_part_get_content_type (mime_part), NULL);
+ } else {
+ file_icon_name =
+ modest_platform_get_file_icon_name (
+ NULL, header_content_type, NULL);
+ }
+ g_free (header_content_type);
+ }