summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-11-03 06:51:33 (GMT)
committerMontel Laurent <montel@kde.org>2016-11-03 06:51:33 (GMT)
commitcff84cbca1f0fdfba99ebd2fab289d15355a2486 (patch)
treeeffcaa6117bb5618541e7ff1de120e17626358ec
parent9b0babc955a92785954a743b0ade07363ebb9558 (diff)
Don't strip my identity in this case
-rw-r--r--messagecomposer/src/helper/messagefactory.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/messagecomposer/src/helper/messagefactory.cpp b/messagecomposer/src/helper/messagefactory.cpp
index 6fb8232..adc7beb 100644
--- a/messagecomposer/src/helper/messagefactory.cpp
+++ b/messagecomposer/src/helper/messagefactory.cpp
@@ -210,7 +210,7 @@ MessageFactory::MessageReply MessageFactory::createReply()
if (!fromAddress.isEmpty()) {
if (!sender.isEmpty() && m_identityManager->thatIsMe(fromAddress)) {
// strip all my addresses from the list of recipients
- toList = stripMyAddressesFromAddressList(recipients, m_identityManager);
+ toList = recipients;
toList += m_origMsg->from()->mailboxes();
stripMyAddresses = false;
} else {
@@ -250,7 +250,9 @@ MessageFactory::MessageReply MessageFactory::createReply()
if (!ccRecipients.isEmpty()) {
// strip all my addresses from the list of CC recipients
- ccRecipients = stripMyAddressesFromAddressList(ccRecipients, m_identityManager);
+ if (stripMyAddresses) {
+ ccRecipients = stripMyAddressesFromAddressList(ccRecipients, m_identityManager);
+ }
// in case of a reply to self, toList might be empty. if that's the case
// then propagate a cc recipient to To: (if there is any).