Mail first (closes #118)