Index: simplenews.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simplenews/simplenews.module,v
retrieving revision 1.76.2.132
diff -U5 -r1.76.2.132 simplenews.module
--- simplenews.module	8 May 2009 07:59:34 -0000	1.76.2.132
+++ simplenews.module	4 Jun 2009 17:59:17 -0000
@@ -2119,11 +2116,18 @@
       }
     }
   }
 
   // Get tokens from user_mail_tokens() and add simplenews variables.
-  $vars = user_mail_tokens($subscription, $language);
+  if($subscription->uid) {
+    $vars = user_mail_tokens($subscription, $language);
+  }
+  else {
+    $vars = array();
+    $vars['!site'] = variable_get('site_name', 'Drupal');
+    $vars['!mailto'] = $subscription->mail;
+  }
   // Replace existing uri and uri_brief to cope with multilingual sites.
   $vars['!uri'] = url('', array('absolute' => TRUE, 'language' => $language));
   $vars['!uri_brief'] = preg_replace('!^https?://!', '', $vars['!uri']);
   $vars['!confirm_subscribe_url'] = url('newsletter/confirm/add/'. $hash, array('absolute' => TRUE, 'language' => $language));
   $vars['!confirm_unsubscribe_url'] = url('newsletter/confirm/remove/'. $hash, array('absolute' => TRUE, 'language' => $language));