Mail Configuration bug fix