Contacts in my phone do not have country codes included. So when I send an SMS message, it is sent to the number without the code. When I receive the response, another thread is created, because the sender's number now includes the country code. How can I solve this? Can this be fixed in a small update?