Fixed mail download for mails with already CRLF.

(cherry picked from commit 6b96726436f7009d5addb0fc795743c193d2b2d2)
Conflicts:
	docs/HISTORY.txt


Backport of #653 because #638 is also backported for the `3.4.2` release.

@deiferni please have a look ...