--- field_group.module.old	Wed Aug  1 13:49:32 2012
+++ field_group.module	Wed Aug  1 13:49:23 2012
@@ -123,7 +123,7 @@
  *   The view mode to load.
  */
 function field_group_load_field_group($group_name, $entity_type, $bundle_name, $mode) {
   ctools_include('export');
   $objects = ctools_export_load_object('field_group', 'conditions', array(
     'group_name' => $group_name,
@@ -658,7 +658,7 @@
 
   $element += array(
     '#type' => 'fieldset',
-    '#title' => check_plain(t($group->label)),
+    '#title' => _field_group_tokenize($group->label),
     '#collapsible' => $group->collapsible,
     '#collapsed' => $group->collapsed,
     '#pre_render' => array(),
@@ -679,7 +679,7 @@
  * @param $form The root element or form.
  */
 function field_group_pre_render_div(&$element, $group, &$form) {
-
+	
   $show_label = isset($group->format_settings['instance_settings']['show_label']) ? $group->format_settings['instance_settings']['show_label'] : 0;
   $label_element = isset($group->format_settings['instance_settings']['label_element']) ? $group->format_settings['instance_settings']['label_element'] : 'h2';
   $effect = isset($group->format_settings['instance_settings']['effect']) ? $group->format_settings['instance_settings']['effect'] : 'none';
@@ -690,14 +690,14 @@
   $group->classes .= " speed-$speed effect-$effect";
   if ($group->format_settings['formatter'] != 'open') {
     $element['#prefix'] = '<div id="' . $element['#id'] . '" class="field-group-format ' . $group->classes . '">
-      <' . $label_element . '><span class="field-group-format-toggler">' . check_plain(t($group->label)) . '</span></' . $label_element . '>
+      <' . $label_element . '><span class="field-group-format-toggler">' . _field_group_tokenize($group->label, $form) . '</span></' . $label_element . '>
       <div class="field-group-format-wrapper" style="display: ' . ($group->collapsed ? 'none' : 'block') . ';">';
     $element['#suffix'] = '</div></div>';
   }
   else {
     $element['#prefix'] = '<div id="' . $element['#id'] . '" class="field-group-format ' . $group->group_name . ' ' . $group->classes . '">';
     if ($show_label) {
-      $element['#prefix'] .= '<' . $label_element . '><span>' . check_plain(t($group->label)) . '</span></' . $label_element . '>';
+      $element['#prefix'] .= '<' . $label_element . '><span>' . _field_group_tokenize($group->label, $form) . '</span></' . $label_element . '>';
     }
     $element['#suffix'] = '</div>';
   }
@@ -759,7 +759,7 @@
 
   $element += array(
     '#type' => 'markup',
-    '#prefix' => '<h3 class="field-group-format-toggler ' . $group->format_type . ($group->collapsed ? '' : ' field-group-accordion-active') . '">' . check_plain(t($group->label)) . '</h3>
+    '#prefix' => '<h3 class="field-group-format-toggler ' . $group->format_type . ($group->collapsed ? '' : ' field-group-accordion-active') . '">' . _field_group_tokenize($group->label, $form) . '</h3>
     <div class="field-group-format-wrapper ' . $group->classes . '">',
     '#suffix' => '</div>',
     //'#attributes' => array('class' => array($group->format_type)),
@@ -780,10 +780,9 @@
  * @param $form The root element or form.
  */
 function field_group_pre_render_htabs(&$element, $group, &$form) {
-
   $element += array(
     '#type' => 'horizontal_tabs',
-    '#title' => check_plain(t($group->label)),
+    '#title' => _field_group_tokenize($group->label, $form),
     '#theme_wrappers' => array('horizontal_tabs'),
     '#prefix' => '<div class="field-group-' . $group->format_type . '-wrapper ' . $group->classes . '">',
     '#suffix' => '</div>',
@@ -800,10 +799,9 @@
  * @param $form The root element or form.
  */
 function field_group_pre_render_htab(&$element, $group, &$form) {
-
   $element += array(
     '#type' => 'fieldset',
-    '#title' => check_plain(t($group->label)),
+    '#title' => _field_group_tokenize($group->label, $form),
     '#collapsible' => $group->collapsible,
     '#collapsed' => $group->collapsed,
     '#attributes' => array('class' => explode(" ", $group->classes)),
@@ -859,7 +857,7 @@
   $group->classes .= $group->format_settings['formatter'] == 'start' ? ' multipage-open' : ' multipage-closed';
   $element += array(
     '#type' => 'multipage_pane',
-    '#title' => check_plain(t($group->label)),
+    '#title' => _field_group_tokenize($group->label, $form),
     '#collapsible' => $group->collapsible,
     '#collapsed' => $group->collapsed,
     '#attributes' => array('class' => explode(" ", $group->classes)),
@@ -920,7 +918,7 @@
   $add = array(
     '#type' => 'fieldset',
     '#id' => 'edit-' . $group->group_name,
-    '#title' => check_plain(t($group->label)),
+    '#title' => _field_group_tokenize($group->label, $form),
     '#collapsible' => $group->collapsible,
     '#collapsed' => $group->collapsed,
     '#attributes' => array('class' => explode(" ", $group->classes)),
@@ -1780,4 +1778,16 @@
   // Allow others to alter the pre_render.
   drupal_alter('field_group_pre_render', $element, $group, $form);
 
+}
+
+/**
+ * Function to substitute the field title with tokens
+ * 
+ * @param $title The title we are checking
+ * @param $node The node object
+ */
+function _field_group_tokenize($title, $form = NULL) {
+	$node = NULL;
+	if (isset($form)) $node=$form['#node'];
+	return check_plain(token_replace(t($title), array('node' => $node)));
 }