Merge pull request #587 in ZP/z-push from bugfix/ZP-1202-imap-part-of-subject-or-from-may to develop

* commit 'fe3c93dd':
  ZP-1202 Code style fixes.
  ZP-1202 Part of subject or from may be in junk string. Released under the Affero GNU General Public License (AGPL) version 3.