Merge "Update remove folder strings." into jb-ub-mail