improve mail issue