I'm not experienced in this stuff, but as far as I understand your problem, I wonder whether you store both versions of numbers for each contact entry or only the long one. I'd understand, that N900 cannot provide the mapping from long to short versions. But, I'd guess, that if you kept both versions for each entry, N900 should recognize the correct caller.