A composition comprising a cationic fabric conditioning agent, a water-soluble protein or derivative thereof, a thickener that is substantive to the fibres of a fabric, a fabric softening silicone and water. Preferably, the cationic fabric conditioning active is di-(tallow carboxyethyl) hydroxyethyl methyl ammonium X and the water-soluble protein is selected from wheat, cotton, silk, keratin, collagen, elastin, casein and soya. The thickener is preferably a water-soluble polymer, more preferably a cationic carbohydrate, most preferably a guar gum. The silicone is preferably an aminosilicone or a methicone derivative and the balance of the composition is water. Most preferably, the composition additionally comprises a fatty compound as a co-softener. The composition has excellent fabric softening properties and also protects fabrics, especially wool from felting.