--- ./modules/i18n/i18ncontent/i18ncontent.module	Thu Mar 04 13:51:54 2010
+++ ./modules/i18n/i18ncontent/i18ncontent.module	Sun Jul 11 13:35:00 2010
@@ -32,7 +32,8 @@
   // Add translated help text for node add pages
   if (!menu_get_object() && $arg[1] == 'add' && $arg[2]) {
     $type = str_replace('-', '_', $arg[2]);
-    if ($help = i18nstrings_ts("nodetype:type:$type:help")) {
+    $source = i18ncontent_node_help($type);
+    if ($help = i18nstrings_ts("nodetype:type:$type:help", $source->source)) {
       return '<p>'. filter_xss_admin($help) .'</p>';
     }
   }
@@ -82,7 +83,8 @@
       // Use the default language for this.
       $language = language_default('language');
       if ($type) {
-        $form['submission']['help']['#default_value'] = i18nstrings_ts("nodetype:type:$type:help", $form['submission']['help']['#default_value'], $language);
+        $source = i18ncontent_node_help($type);
+        $form['submission']['help']['#default_value'] = i18nstrings_ts("nodetype:type:$type:help", $source->source, $language);
       }
       break;
 
@@ -204,4 +206,13 @@
   }
 
   return $output;
-}
\ No newline at end of file
+}
+
+/**
+ * Fetch default source for node type help
+ */
+function i18ncontent_node_help($type) {
+  $context = i18nstrings_context("nodetype:type:$type:help");
+  $source = i18nstrings_get_source($context);
+  return $source;
+}