summaryrefslogtreecommitdiffstats
path: root/kmail/kmkernel.cpp
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2018-03-25 20:20:07 +0200
committerSlávek Banko <[email protected]>2018-03-25 20:20:24 +0200
commitf9301c6c042546a86f28f2ddaccadca7bcf8b9a6 (patch)
tree173ae65f5292e37b3fec32edb26eb22cebc34ed5 /kmail/kmkernel.cpp
parent3f26d326c9bd8fbd60e5d89e20a705c87a837b1f (diff)
downloadtdepim-f9301c6c042546a86f28f2ddaccadca7bcf8b9a6.tar.gz
tdepim-f9301c6c042546a86f28f2ddaccadca7bcf8b9a6.zip
kmail: Avoid setting charset on non-textual parts of emails
Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit 3479159c7ff5c918af12e29a32367843f336b57f)
Diffstat (limited to 'kmail/kmkernel.cpp')
-rw-r--r--kmail/kmkernel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index fb22fca2e..f998a74c3 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -45,6 +45,7 @@ using TDERecentAddress::RecentAddresses;
#include "kmsystemtray.h"
#include "transportmanager.h"
#include "importarchivedialog.h"
+#include <mimelib/enum.h>
#include <twin.h>
#include "kmailicalifaceimpl.h"
@@ -574,7 +575,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
if( ! GlobalSettings::self()->exchangeCompatibleInvitations() ) {
msgPart->setContentDisposition( attachContDisp );
}
- if( !attachCharset.isEmpty() ) {
+ if( !attachCharset.isEmpty() && (msgPart->type() == DwMime::kTypeText) ) {
// kdDebug(5006) << "KMKernel::openComposer set attachCharset to "
// << attachCharset << endl;
msgPart->setCharset( attachCharset );