Merge pull request #568 in ZP/z-push from feature/ZP-1258-use-pr_ec_imap_email-to-get-rfc822 to develop

* commit 'd2af6bfe':
  ZP-1258 Use PR_EC_IMAP_EMAIL to get RFC822 data.