If my memory serves me correctly, the other episode you may be thinking of is "Blueprint For Murder". There's a scene where Columbo goes to question the first wife of the murder victim - who at that point is missing but not proven to be dead yet. A cute, sexy little Japanese girl is giving the wife a massage when Columbo enters, and I think she does flirt with him a little when she addresses him in her own language.