A composition comprising (a) an esterquat that is a quaternized reaction product of an alkanol amine and a fatty acid, wherein from at least 90 wt % to up to 100 wt % of the esterquat is comprised of triesterquat and from 0 wt % to up to 10 wt % of the esterquat is comprised of at least one of monoesterquat and diesterquat, and (b) a water swellable cationic polymer. The water swellable cationic polymer aids in dispersion and/or in deposition of the triesterquat. Also, a method of producing such a composition and a method of softening a fabric, and increasing fragrance delivery, comprising treating the fabric with the composition.