Attachments and content in Mail receiver adapter

Hi guys,

I have an SOAP->Mail scenario and I have a problem with handling attachments and content in the same email. The issue is, that if I want to keep attachments which are sent with SOAP request, I need to check "Keep attachments" checkbox in receiver mail communication channel.

However, technically, Payload is also an attachment and the adapter adds payload also as an attachment instead keeping the body in the mail body.

So finally I end up with an email having no body and original attachment and payload attachment.

Any ideas how I could set up the adapter so I get a body with a proper content and required attachments?

I use Mail package and am on 7.31 version.

Thanks guys in advance,

Peter