Merge pull request #14 in ZP/z-push from bugfix/ZP-647-backendcombined-sendmail-source--folderid to develop

* commit 'bfc4c616':
  fix(ZP-647): BackendCombined: SendMail source->folderid

(cherry picked from commit 21a2d658)