UPD: #1225 for MailModule + small PSR and somes fixes