trimming and bug fixing
Merge branch 'master' of https://github.com/joshuapohl/NewsMailCD