Merge more messages patch from tntrun