diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index e18f445d4c..ab19aa1666 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-10-15 Larry Ewing <lewing@ximian.com> + + * mail-callbacks.c (mail_generate_reply): don't apply the body + text in replys since we will just replace it anyway. + 2001-10-15 Jeffrey Stedfast <fejj@ximian.com> * component-factory.c (owner_unset_cb): Call @@ -20,6 +25,7 @@ * mail-mt.c (mail_call_main): new generic interface for calling stuff/proxying in the gui thread. +>>>>>>> 1.1832 2001-10-14 Jon Trowbridge <trow@ximian.com> * e-searching-tokenizer.c (e_searching_tokenizer_clone): Share diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index e50bcac040..b5cbe6c19e 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -822,7 +822,7 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char const int max_subject_length = 1024; composer = e_msg_composer_new (); - e_msg_composer_add_message_attachments (composer, message, TRUE); + e_msg_composer_add_message_attachments (composer, message, FALSE); if (!composer) return NULL; |