--- /data/drupal/simplenews_template/simplenews_template.module	2009-11-11 18:11:12.000000000 +0100
+++ sites/all/modules/simplenews_template/simplenews_template.module	2011-01-30 23:17:33.102398000 +0100
@@ -100,12 +100,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'];