Couple of changes to new messages