[mail] fixes for #57