Improve messenger a little