fixed cases whereuserlist contains carriage returns (which sendmail doesnt like)
Merge branch 'master' into fp