Rolled back the version lock on mail to something sensible until the authors merge in the fix.