refine mail handling refs #15