--- simplenews_template.module	2009-01-31 20:32:48.000000000 +0000
+++ simplenews_template_fix.module	2009-02-05 15:22:47.000000000 +0000
@@ -36,7 +36,7 @@ function simplenews_template_mail_alter(
   $function = "_simplenews_template_mail_alter_{$message['id']}";
   if (function_exists($function)) {
     $function($message);
-  } else if (!$processed) {
+  } else if (!$processed && !empty($message)) {
     _simplenews_template_mail_alter_simplenews_node($message);
     $processed = TRUE;
   }
@@ -88,13 +88,7 @@ function simplenews_template_form_alter(
  */
 function _simplenews_template_mail_alter_simplenews_node(&$message) {
   // Setup newsletter data
-  $tid = reset($message['params']['context']['account']->tids);
-  if (!empty($message['params']['context']['account']->tids)) {
-    $tid = reset($message['params']['context']['account']->tids);
-  } else {
-    $tid = $message['params']['context']['newsletter']->tid;
-  }
-  
+  $tid = $message['params']['context']['newsletter']->tid;
   $newsletter = taxonomy_get_term($tid);
   $node = $message['params']['context']['node'];
   $content = $message['body']['body'];