Optimizing collapse/expand feature in messageList
Merge branch 'refact_message_list' into develop