Merge pull request #1709 from bbarao/develop

Fix email headers when using long email subjects and \r\n as crlf.