Patch to fix mailcatcher