Several changes to Message and LastMessage