That may not help, for a few reasons. First, there are some patches to the email package that got applied after 2.2 was released.

Have you been including a later-than-2.2 email.py in the CVS? I've been ignoring it there, perhaps to my detriment...