Added mail trap for email testing