We use the “Heath and James mod”, to tag spam messages with
"X-Spam-Flag: Yes" and send them to the "Junk Mail" folder. The problem
we run into with this method is that any incoming spam message that has
the recipient in the to and from fields, bypasses the junk mail rules
and goes to the inbox. This has not been a problem until lately we have
been dealing with a very persistent phishing campaign

is there a way to stop the behavior of letting email with the
"X-Spam-Flag: Yes" tag bypass the Junk Mail folder if the from address
is the recipients address?

example header:

Return-path: <honda@kagawaseiko.co.jp>
Received: from kagawaseiko.co.jp (063.ourdomain.com [])
by mail.ourdomain.com with ESMTP (TLS encrypted); Tue, 19 Feb 2019
06:17:53 -0600
Received: FROM kagawaseiko.co.jp ( BY ourdomain.com WITH ESMTP
FOR userg@ourdomain.com;
Tue, 19 Feb 2019 06:17:53 -0500
Received: from [84-241-63-206.shatel.ir] (unknown [])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client did not present a certificate)
by kagawaseiko.co.jp (Postfix) with ESMTPSA id 15C8518A0E68
for <userg@ourdomain.com>; Tue, 19 Feb 2019 21:17:48 +0900 (JST)
User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101
From: <userg@ourdomain.com>
X-Sender: <honda@kagawaseiko.co.jp>

<mailto:u-ifsimrh_xzckmcsjhl_ozkhqyhqus_gkgktrgjk_v@bounce.k agawaseiko.co.jp?subject=Unsubscribe>
To: userg@ourdomain.com
Subject: userg
Date: Tue, 19 Feb 2019 13:17:49 +0100
Message-ID: <056f0ojkjo4kgub2dyyqe7yumi9id@6kin5xxxk9rydch2fbs 0qdpsde>
Content-Transfer-Encoding: base64
Content-Type: text/plain; charset=UTF-8
X-Priority: 2
X-Sender-Info: <honda@kagawaseiko.co.jp>
List-Help: <http://aavcdhx.com/lq/rvanus/gjyavuqhs>
List-ID: <03791515.rvbulonlio.local>
X-Spam-Flag: Yes