Fixed minor issues with liberation tasks

We still have an issue with users with a large number of emails (say, 30K) and really need to deal with that in some way as we did with deletion