Adding support for marking messages as removed