Fixed the double quotes issue in buildMailProperties