Fixed mail handling, hopefully