Work on selective message restoring.