mail cb fix