Fix caller ID matching for messaging