A fabric conditioning composition comprising an emulsion of particles in an aqueous vehicle, the particles comprising (a) an esterquat comprising an alkyl dialkanol amine esterquat of a fatty acid, wherein from at least 90 wt % to up to 100 wt % of the esterquat is comprised of diesterquat and from 0 wt % to up to 10 wt % of the esterquat is comprised of monoesterquat, and the fatty acid is substantially saturated and has an iodine value of less than 5, and (b) a water swellable cationic polymer.