@slavcodev Could you move `addAttachment` and `getAttachments` into `Mail` entity, in fact an `Attachment` can be sent from `TextMail` or `HtmlMail` Thanks :).