Renamed mailimap_search_key_xgmthrid_new -> mailimap_search_key_new_xgmthrid and removed mailimap_search_key_xgmthrid.