Fix Bug 340312 - Attachments are not encrypted when "automatic encryption" is selected

FIXED-IN: 14.12
BUG: 340312

messagecomposer/composer/composerviewbase.cpp

@@ -1642,22 +1642,18 @@ void MessageComposer::ComposerViewBase::markAllAttachmentsForSigning(bool sign)
 {
     if (m_attachmentModel) {
         foreach( MessageCore::AttachmentPart::Ptr attachment, m_attachmentModel->attachments() ) {
-            if( attachment->isSigned() ) {
             attachment->setSigned(sign);
         }
     }
-    }
 }
 
 void MessageComposer::ComposerViewBase::markAllAttachmentsForEncryption(bool encrypt)
 {
     if (m_attachmentModel) {
         foreach( MessageCore::AttachmentPart::Ptr attachment, m_attachmentModel->attachments() ) {
-            if( attachment->isEncrypted() ) {
             attachment->setEncrypted(encrypt);
         }
     }
-    }
 }
 
 bool MessageComposer::ComposerViewBase::determineWhetherToSign( bool doSignCompletely, Kleo::KeyResolver* keyResolver, bool signSomething, bool & result, bool &canceled )