Merge "Improve serialization of Message, Title"