6.x 3.3 sustainer mail

This is ready for merging into RC1.