summaryrefslogtreecommitdiffstats
path: root/kmail/messagecomposer.cpp
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-03-25 20:20:07 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-03-25 20:20:07 +0200
commit3479159c7ff5c918af12e29a32367843f336b57f (patch)
tree51f02c82108522fccf6ece95e926dfa29a1a8dc3 /kmail/messagecomposer.cpp
parent8996740084e6d31d323cfeb1a269f8427ff3f6bf (diff)
downloadtdepim-3479159c7ff5c918af12e29a32367843f336b57f.tar.gz
tdepim-3479159c7ff5c918af12e29a32367843f336b57f.zip
kmail: Avoid setting charset on non-textual parts of emails
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kmail/messagecomposer.cpp')
-rw-r--r--kmail/messagecomposer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index 2a82da9e4..9b5763dd0 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -1251,7 +1251,9 @@ void MessageComposer::composeInlineOpenPGPMessage( KMMessage& theMessage,
}
mOldBodyPart.setContentDisposition( "inline" );
mOldBodyPart.setOriginalContentTypeStr( oldContentType.utf8() );
- mOldBodyPart.setCharset(mCharset);
+ if (mOldBodyPart.type() == DwMime::kTypeText) {
+ mOldBodyPart.setCharset(mCharset);
+ }
addBodyAndAttachments( msg, splitInfo, false, false, mOldBodyPart, Kleo::InlineOpenPGPFormat );
mMessageList.push_back( msg );
if ( it == splitInfos.begin() ) {