LILY-339: Sending attachments works with async sending of emails
Merge branch 'feature/async-send-emailmessage-attachments' into develop