JC-1740, JC-1750 Fixed messages deleted before in previous merge.