more places to fix the new linebreak behaviour of the base64 encoder.