make quote folding an option so we can enable/disable it
Merge branch '4.2/quote-folding-config'