Fixing Cloudmailin bug