diff options
Diffstat (limited to 'libemail-engine/mail-ops.c')
| -rw-r--r-- | libemail-engine/mail-ops.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c index e24e8c9752..748152602c 100644 --- a/libemail-engine/mail-ops.c +++ b/libemail-engine/mail-ops.c @@ -623,10 +623,13 @@ mail_send_message (struct _send_queue_msg *m, sent_folder_uri = g_strstrip (g_strdup (tmp)); if (replies_to_origin_folder) { - tmp = camel_header_raw_find (&xev, "X-Evolution-Source-Folder", NULL); - if (tmp != NULL && camel_header_raw_find (&xev, "X-Evolution-Source-Message", NULL) != NULL) { - g_free (sent_folder_uri); - sent_folder_uri = g_strstrip (g_strdup (tmp)); + tmp = camel_header_raw_find (&xev, "X-Evolution-Source-Flags", NULL); + if (tmp != NULL && strstr (tmp, "FORWARDED") == NULL) { + tmp = camel_header_raw_find (&xev, "X-Evolution-Source-Folder", NULL); + if (tmp != NULL && camel_header_raw_find (&xev, "X-Evolution-Source-Message", NULL) != NULL) { + g_free (sent_folder_uri); + sent_folder_uri = g_strstrip (g_strdup (tmp)); + } } } |