Merge "MAP: Handle MessageListing empty folder name if set to current path."