[#448]Revert to default mail handling