task #00046-Email_with_attachments: Minor fix
Merge branch '00046-Email_with_attachments' into develop