diff --git a/lib/Driver.php b/lib/Driver.php
index 66fc001b..7498798c 100644
--- a/lib/Driver.php
+++ b/lib/Driver.php
@@ -2332,7 +2332,12 @@ public function toHash(Horde_Icalendar_Vcard $vcard)
                         $hash[$prefix . 'Address'] .= ' ' . $hash[$prefix . 'PostalCode'];
                     }
                     if (!empty($address[Horde_Icalendar_Vcard::ADR_COUNTRY])) {
-                        include 'Horde/Nls/Countries.php';
+                        /* Countries */
+                        if (class_exists(\Horde_Nls_Loader::class)) {
+                            $countries = \Horde_Nls_Loader::loadCountries();
+                        } else {
+                            include 'Horde/Nls/Countries.php';
+                        }
                         $country = array_search($address[Horde_Icalendar_Vcard::ADR_COUNTRY], $countries);
                         if ($country === false) {
                             $country = $address[Horde_Icalendar_Vcard::ADR_COUNTRY];
@@ -2932,7 +2937,11 @@ public function fromASContact(Horde_ActiveSync_Message_Contact $message)
         }
 
         /* Countries */
-        include 'Horde/Nls/Countries.php';
+        if (class_exists(\Horde_Nls_Loader::class)) {
+            $countries = \Horde_Nls_Loader::loadCountries();
+        } else {
+            include 'Horde/Nls/Countries.php';
+        }
         if (!empty($message->homecountry)) {
             if (!empty($this->map['homeCountryFree'])) {
                 $hash['homeCountryFree'] = $message->homecountry;