--- nodereference.module	2007-10-16 11:56:36.000000000 -0400
+++ nodereferenceNew.module	2007-10-16 15:41:52.000000000 -0400
@@ -56,6 +56,12 @@ function nodereference_field_settings($o
           $views[t('Default Views')][$view->name] = $view->name;
         }
         if (count($views) > 1) {
+		  if (module_exists('token')) {
+			$tokens_help = theme('token_help', 'global', '%', '');
+		  }
+		  else {
+			$tokens_help = t('You must install the token module to use tokens!');
+		  }
           $form['advanced'] = array(
              '#type' => 'fieldset',
              '#title' => t('Advanced - Nodes that can be referenced (View)'),
@@ -74,7 +80,7 @@ function nodereference_field_settings($o
             '#title' => t('View arguments'),
             '#default_value' => isset($field['advanced_view_args']) ? $field['advanced_view_args'] : '',
             '#required' => FALSE,
-            '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
+            '#description' => t('Provide a comma separated list of arguments to pass to the view. You may use the following tokens: '. $tokens_help) ,
           );
         }
       }
@@ -395,8 +401,10 @@ function _nodereference_potential_refere
     // arguments for the view
     $view_args = array();
     if (isset($field['advanced_view_args'])) {
-      // TODO: Support Tokens using token.module ?
-      $view_args = array_map(trim, explode(',', $field['advanced_view_args']));
+      if (module_exists('token')) {
+        $view_args = token_replace($field['advanced_view_args'], $type = 'global', $object = NULL, $leading = '%', $trailing = '');
+      }
+      $view_args = array_map(trim, explode(',', $view_args));
     }
 
     if (isset($string)) {