diff options
Diffstat (limited to 'kmail/kmcommands.cpp')
| -rw-r--r-- | kmail/kmcommands.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 8b477924f..a61850132 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -1350,13 +1350,10 @@ KMCommand::Result KMForwardAttachedCommand::execute() KMMessagePart *msgPart = new KMMessagePart; msgPart->setTypeStr("message"); msgPart->setSubtypeStr("rfc822"); - msgPart->setCharset(msg->charset()); msgPart->setName("forwarded message"); msgPart->setContentDescription(msg->from()+": "+msg->subject()); msgPart->setContentDisposition( "inline" ); - // THIS HAS TO BE AFTER setCte()!!!! msgPart->setMessageBody( KMail::Util::ByteArray( msg->asDwString() ) ); - msgPart->setCharset(""); fwdMsg->link(msg, KMMsgStatusForwarded); mWin->addAttach(msgPart); @@ -2893,7 +2890,9 @@ KMCommand::Result KMResendMessageCommand::execute() whiteList << "To" << "Cc" << "Bcc" << "Subject"; newMsg->sanitizeHeaders( whiteList ); - newMsg->setCharset(msg->codec()->mimeName()); + if( newMsg->type() == DwMime::kTypeText) { + newMsg->setCharset(msg->codec()->mimeName()); + } newMsg->setParent( 0 ); // make sure we have an identity set, default, if necessary |