messages improvements