An initial go at mail configuration per #453