small fixes on mailcheck