SMS relay: COUNTRY code issue
When receiving SMS (green bubbles) on my Mac, often (though not always) they come in without the country code e.g. 987654321 instead of +244 987654321, the Messages app on Mac doesn't identify them as part of my contacts and I have to go check on my iPhone to see who sent the SMS.
The issue is that if I answer directly from my Mac, for some reason my Mac is adding the country code +44 to that number (e.g. +44 987654321) and I'm ending up sending an International SMS rather than answering to the intended number which would start with country code +244 (+244 987654321) as indeed it is stored in my contacts to start with. I've only noticed recently when people complained they weren't receiving my SMS answer which I claimed to have sent.
Ideally I would like to have a better sync in contacts between Mac and iPhone; ALL my contacts' phone numbers are stored WITH COUNTRY CODE, so there shouldn't be a reason for this type of confusion to be happening.
I've already tried looking for country code options in the messages app in my MacBook Pro in order to find a temporary fix but couldn't find anything. If the numbers were correctly identified by my MacBook Pro Messages App, there would be no need for temporary fixes or country code settings, provided the contacts were correctly stored in the Contacts App with country code, which is my case. Very frustrating.
Is anyone else experiencing this type of issue? HELP!
MacBook Pro Mid-2012 running OS X Yosemite (10.10); iPhone 5S running the latest iOS 8.1, all the latest updates done.
MacBook Pro (13-inch Mid 2012), OS X Yosemite (10.10)