Align to new spatch work flow. Fixed max. email header line length bug.