aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-callbacks.c20
2 files changed, 16 insertions, 10 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a294c45ba4..5dacf21e66 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,6 +1,10 @@
2001-02-26 Jeffrey Stedfast <fejj@ximian.com>
- * mail-accounts.c (mail_delete): Confirm thatt he user REALLY
+ * mail-callbacks.c (mail_generate_reply): Set a "References"
+ header no matter what if we are able to get a Message-Id. Fixes
+ bug #1583.
+
+ * mail-accounts.c (mail_delete): Confirm that the user REALLY
wants to delete this account.
(news_delete): Same.
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 1cbb3c2783..ae64e6f116 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -617,18 +617,20 @@ mail_generate_reply (CamelMimeMessage *message, gboolean to_all)
g_free (subject);
/* Add In-Reply-To and References. */
- message_id = camel_medium_get_header (CAMEL_MEDIUM (message),
- "Message-Id");
- references = camel_medium_get_header (CAMEL_MEDIUM (message),
- "References");
+ message_id = camel_medium_get_header (CAMEL_MEDIUM (message), "Message-Id");
+ references = camel_medium_get_header (CAMEL_MEDIUM (message), "References");
if (message_id) {
+ char *reply_refs;
+
e_msg_composer_add_header (composer, "In-Reply-To", message_id);
- if (references) {
- char *reply_refs;
+
+ if (references)
reply_refs = g_strdup_printf ("%s %s", references, message_id);
- e_msg_composer_add_header (composer, "References", reply_refs);
- g_free (reply_refs);
- }
+ else
+ reply_refs = g_strdup (message_id);
+
+ e_msg_composer_add_header (composer, "References", reply_refs);
+ g_free (reply_refs);
} else if (references) {
e_msg_composer_add_header (composer, "References", references);
}