Nicer handling of message buffer + intro msg