Fixes adding new messages, now deals with lists of messages to add
Merge from master.