improve SendMessageCommandHandler