Dev/attachments

remove side-effect from smtp client