From 3a768e46f4c068ac0b271fc4e9c995bf160d4e08 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 3 Jan 2018 18:26:22 +0100 Subject: [PATCH] =?UTF-8?q?Bug=20791346=20-=20=E2=80=98Disposition-Notific?= =?UTF-8?q?ation-To=E2=80=99=20header=20doesn=E2=80=99t=20take=20into=20ac?= =?UTF-8?q?count=20the=20=E2=80=98From=20Override=E2=80=99=20field?= =?UTF-8?q?=E2=80=99s=20value?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/composer/e-msg-composer.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/composer/e-msg-composer.c b/src/composer/e-msg-composer.c index dbadf7a210..d96b6c8006 100644 --- a/src/composer/e-msg-composer.c +++ b/src/composer/e-msg-composer.c @@ -36,6 +36,7 @@ #include #include "e-composer-from-header.h" +#include "e-composer-text-header.h" #include "e-composer-private.h" #include @@ -1198,9 +1199,19 @@ composer_build_message (EMsgComposer *composer, /* Disposition-Notification-To */ if (flags & COMPOSER_FLAG_REQUEST_READ_RECEIPT) { + EComposerHeader *header; const gchar *mdn_address; - mdn_address = e_source_mail_identity_get_reply_to (mi); + header = e_composer_header_table_get_header (table, E_COMPOSER_HEADER_REPLY_TO); + mdn_address = e_composer_text_header_get_text (E_COMPOSER_TEXT_HEADER (header)); + + if (!mdn_address || !*mdn_address) { + header = e_composer_header_table_get_header (table, E_COMPOSER_HEADER_FROM); + mdn_address = e_composer_from_header_get_address (E_COMPOSER_FROM_HEADER (header)); + } + + if (!mdn_address || !*mdn_address) + mdn_address = e_source_mail_identity_get_reply_to (mi); if (mdn_address == NULL) mdn_address = e_source_mail_identity_get_address (mi); if (mdn_address != NULL)