Added proper mail fields for Grails