[MERGE] mail: merge to get all changes related to mail search view improvment