A fabric conditioner composition comprising an amino-functional, epoxide group containing silicone polymer having a weight average molecular weight of 400,000 to 900,000 a branched amine functional silicone. The branched amine functional silicone can be of structure R3SiO(RSi((CH2)aR′)O)m(RSi(OR″))n(R2SiO)pSiR3. The combination of the amino-functional, epoxide group containing silicone polymer and amine functional silicone can to reduce time needed for drying fabric, reducing color fading of fabric during laundering, reducing pilling of fabric, and reducing force needed to iron fabric.