--- a/simplenews_template.module	2010-06-29 11:31:02.000000000 -0400
+++ b/simplenews_template.module	2010-06-29 11:34:36.000000000 -0400
@@ -100,11 +100,9 @@
  */
 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 = $message['params']['context']['newsletter']->tid;
+  if (!$tid) {
     $tid = reset($message['params']['context']['account']->tids);
-  } else {
-    $tid = $message['params']['context']['newsletter']->tid;
   }
 
   $newsletter = taxonomy_get_term($tid);