new version of mail-plugin