fix for #5350 - encode mail