Merge "Add PLURAL support to youhavenewmessages*"