Fabric conditioning composition

The present invention provides an aqueous conditioning composition comprising: (i) a water-insoluble, non-ester, quaternary ammonium fabric conditioning agent having at least 2 alkyl and/or alkenyl groups of at least 12 carbon atoms, or an alkyl or alkenyl group having a chain length of at least 20 carbon atoms; (ii) a water-soluble quaternary ammonium cationic surfactant and (iii) perfume, at least a portion of which is encapsulated. The composition is made by a specific process which comprises adding the encapsulated perfume to water prior to the addition of the water-insoluble quaternary ammonium fabric conditioning agent and adding the water-soluble quaternary ammonium cationic surfactant after the addition of the water-insoluble quaternary ammonium fabric conditioning agent and any free perfume and at a temperature below the phase transition temperature of the composition.