A fabric conditioner composition comprising: a cationic fabric softener, and 0.02 to 0.32% by weight of an amino-functional, epoxide group containing silicone polymer having a weight average molecular weight of 400,000 to 900,000 is described. Also, a method of reducing wrinkles on fabric during laundering comprising laundering the fabric with a composition comprising 0.02 to 0.32% by weight of an amino-functional, epoxide group containing silicone polymer having a weight average molecular weight of 400,000 to 900,000 is described. The polymer is unexpectedly effective at low levels of use.