paginator stuff that should have been fixed when we ran into these issues with inboxes
I think I've caught the last of the regex errors