Merge "MessagingStyle: Add historic messages"