slight MessageBuffer redesign