Hydrodynamic dispersion and mass transfer in unsaturated flow