Add simpler, modern mail handling
cleanup