Patch/broken mail