Introduce a new method, General::wrapInCDATAIfNeeded

Fix stupid inversion

Make it the default behavior for wrapInCDATA
Replace the cdata-ing by the new method

Use wrapInCDATA in email gateway