Added mail support on development env