Fixes in calendar control
Mail config
Email config