Cairo and Tehran move to mend fences