Update patch for the "mail" module to match upstream