We do spam filtering for Zimbra on an external system. Any mail that is marked by that external system as probably spam is placed (via a rule on the Zimbra side) in the user's Junk folder.
Prior to the upgrade from 5.0.21 to 6.0.5 this worked great. When a user found a message a folder other than Junk, they would click "Junk" on that message which would send it to the spam@our-zimbra-server address (which is where we investigate those messages).
POST upgrade now any and all messages placed in the Junk folder, even by the filter rule in Zimbra, sends these messages to the spam@our-zimbra-server address.
Is there any way to change this so the only messages reported to the spam@ address within Zimbra are those where a user manually clicks Junk (or drags the message to the Junk folder) and exclude those messages which are placed by a zimbra mail filter?