diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php
index 889d88ae4591981608e4f44a29dd7c8815a1116a..ab6533ef9ef906cb5d32a1a3f516b7f7038b55b5 100644
--- a/CRM/Core/I18n.php
+++ b/CRM/Core/I18n.php
@@ -229,6 +229,14 @@ class CRM_Core_I18n {
       $context = NULL;
     }
 
+    // gettext domain for extensions
+    $domain_changed = FALSE;
+    if (isset($params['domain'])) {
+      if ($this->setGettextDomain($params['domain'])) {
+        $domain_changed = TRUE;
+      }
+    }
+
     // do all wildcard translations first
     $config = CRM_Core_Config::singleton();
     $stringTable = CRM_Utils_Array::value($config->lcMessages,
@@ -303,6 +311,10 @@ class CRM_Core_I18n {
       $text = addcslashes($text, "'");
     }
 
+    if ($domain_changed) {
+      $this->setGettextDomain('civicrm');
+    }
+
     return $text;
   }
 
@@ -361,6 +373,41 @@ class CRM_Core_I18n {
     }
   }
 
+  /**
+   * Binds a gettext domain, wrapper over bindtextdomain().
+   *
+   * @param  $key Key of the extension (can be 'civicrm', or 'org.example.foo').
+   *
+   * @return void
+   */
+  function setGettextDomain($key) {
+    static $cache = array();
+
+    // It's only necessary to find once
+    if (! isset($cache[$key])) {
+      $config = CRM_Core_Config::singleton();
+
+      try {
+        $mapper = CRM_Extension_System::singleton()->getMapper();
+        $path = $mapper->keyToBasePath($key);
+        $info = $mapper->keyToInfo($key);
+        $domain = $info->file;
+
+        bindtextdomain($domain, $path . DIRECTORY_SEPARATOR . 'l10n');
+        bind_textdomain_codeset($domain, 'UTF-8');
+        $cache[$key] = $domain;
+      }
+      catch (CRM_Extension_Exception $e) {
+        // There's not much we can do at this point
+        $cache[$key] = FALSE;
+      }
+    }
+
+    if (isset($cache[$key]) && $cache[$key]) {
+      textdomain($cache[$key]);
+    }
+  }
+
   /**
    * Static instance provider - return the instance for the current locale.
    */