Merge pull request #640 in ZP/z-push from bugfix/ZP-1345-own-private-items-stripped-when-folder-is-in-additionalfolders to develop

* commit '7ce9d624':
  ZP-1345 Optimize the check for shared and private messages.
  ZP-1345 Own private items stripped when folder is in $additionalFolders.