Ensure Received header is being removed.
Replace Windows EOF's. Some mail clients throw up because of it.
Merge remote-tracking branch 'origin/master'