ZP-227 #comment Merge contribution - imap wasteID should be converted to imapId - rev 1391 - changed parenthesis style to match z-push coding style  #time 5m

git-svn-id: https://z-push.org/svn/z-push/trunk@1455 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5