Improve MessageList