Merge "Rename keep.xml in spam."