Mail Configuration fix