Add email firewall
Merge remote-tracking branch 'meskio/feature/6040_email_firewall' into develop