A prosthetic heart valve includes a stent having a collapsed condition and an expanded condition, the stent having a proximal end, a distal end and a plurality of commissure features. The heart valve further includes a valve assembly secured to the stent, the valve assembly including a cuff and a plurality of leaflets (1408), each of the leaflets having a free edge (1410) having a first end and a second end, and a second edge (1414) secured to the cuff, the second edge (1414) having a first end, a second end, a first folded portion (1420) adjacent the first end, a second folded portion (1420) adjacent the second end, and an unfolded portion between the first and second folded portions. The first and second folded portions couple the leaflet to ones of the commissure features.