fixed folder tree for email and fixed searching in these folders