- /* Embbeded messages are not offered to be
- saved. Purged attachments are ignored as well */
- if (!TNY_IS_MSG (part) && !tny_mime_part_is_purged (part)) {
- gchar *label;
- gchar *filename = NULL;
-
- filename = g_strdup (tny_mime_part_get_filename (part));
+ /* Ignore purged attachments and messages if ignore is
+ set to TRUE */
+ if (!(tny_mime_part_is_purged (part) ||
+ (TNY_IS_MSG (part) && !include_msgs))) {
+
+ if (TNY_IS_MSG (part)) {
+ TnyHeader *header = tny_msg_get_header (TNY_MSG (part));
+ filename = tny_header_dup_subject (header);
+ g_object_unref (header);
+ } else {
+ filename = g_strdup (tny_mime_part_get_filename (part));
+ }