Bug fix in mail configuration