Improved Mail mailer detect and updated modules