--- simplenews_template.module	2009-10-15 12:14:56.000000000 +0200
+++ simplenews_template.module	2009-10-15 12:11:45.000000000 +0200
@@ -96,14 +96,23 @@ function _simplenews_template_mail_alter
   $node = $message['params']['context']['node'];
   $content = $message['body']['body'];
 
+  // Tokenize the header and footer: find the tokens
+  global $language, $user;
+  $context['node'] = $node;
+  $variables = simplenews_mail_tokens($user, $message['params']['context'], $language);
+  
   // Retrive and filter the header content
   $header = _simplenews_template_get_header($tid);
+  // Tokenize the header
+  $header = strtr($header, $variables);
   $header = check_markup($header, _simplenews_template_get_header_format($tid), false);
 
   // Retrive and filter the footer content
   $footer = _simplenews_template_get_footer($tid);
+  // Tokenize the footer
+  $footer = strtr($footer, $variables);
   $footer = check_markup($footer, _simplenews_template_get_footer_format($tid), false);

   // Add headers and footer
   $content = theme('simplenews_template_content', $newsletter->name, $node->title, $header, $content, $footer);