That patch appears to not be working. Had another customer receive this message today (names/emails blanked or subbed out for security:
From: Admin <my-email>
Subject: Final Reminder – Payment Failed.
Date: May 10, 2017 at 11:38:07 AM CDT
Reply-To: <my-email> \r\nReturn-Path: <my-email>
Our last attempt to charge the membership payment for your account failed.
You are requested to log in to your account at ———– to provide a different payment method, or contact your bank/credit-card company to resolve this issue.
Failure to do so will result in your account being removed from ————-.