diff --git a/objecttreeparser.cpp b/objecttreeparser.cpp index df6018151..2ed7b54c2 100644 --- a/objecttreeparser.cpp +++ b/objecttreeparser.cpp @@ -803,11 +803,6 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, bool ObjectTreeParser::processTextHtmlSubtype( partNode * curNode, ProcessResult & ) { const QByteArray partBody( curNode->msgPart().bodyDecoded() ); - QString bodyText; - if ( mReader->htmlMail() ) - bodyText = codecFor( curNode )->toUnicode( partBody ); - else - bodyText = KMMessage::html2source( partBody ); mRawReplyString = partBody; if ( curNode->isFirstTextPart() ) { @@ -818,6 +813,12 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, if ( !mReader ) return true; + QString bodyText; + if ( mReader->htmlMail() ) + bodyText = codecFor( curNode )->toUnicode( partBody ); + else + bodyText = KMMessage::html2source( partBody ); + if ( curNode->isFirstTextPart() || attachmentStrategy()->defaultDisplay( curNode ) == AttachmentStrategy::Inline || showOnlyOneMimePart() )