The MailFormatting.php include may need to be deleted manually, but everything else should be taken care of just by reapplying the server behavior.
Just open the email server behavior and click "ok" and it should update the code. The only thing you would have to do is delete the reference to the include file I mentioned above.