Mail parsing tweaks.
Fixed email duplicate bug
Fixed merge conflit
Merge branch 'turnedin' of https://github.com/unekwu/crazy_mail into turnedin
Merge branch 'master' of https://github.com/unekwu/crazy_mail into turnedin