Restored mail folders conflict with renamed original ones