changes in message UI
merging changes