Some mail fixes