mail transfer fixes