Merge "Revert empty folder check because it doesn't work for search" into ub-mail-master