Patches to fix endless email stream.