--- orig.autoresponder.module	Fri Apr 18 03:32:10 2008
+++ autoresponder.module-1	Tue Jun 24 23:55:02 2008
@@ -364,7 +364,7 @@ function autoresponder_cron() {
 /*
   * Mail sending function. Code taken from Simple News module with small customizations. HTML to text conversion by code from HTML2TXT module 
   */
-function autoresponder_mail($u, $mail) {
+function autoresponder_mail($u, $mail, $no_unsubscribe=false) {
   $mail->to = isset($u->mail) ? $u->mail : $u->email;
   $from_email = isset($mail->from_address) ? $mail->from_address : variable_get('site_mail', ini_get('sendmail_from'));
   $from = isset($mail->from_name) ? '"'. addslashes($mail->from_name).'" <'. $from_email .'>' : $from_email;
@@ -379,10 +379,18 @@ function autoresponder_mail($u, $mail) {
   $plain_text_only = FALSE;
   $plain_text_body = autoresponder_html_to_text($mail->body, array());
   $hash = md5($mail->to);
+  
+  if(!is_bool($no_unsubscribe)) {
+    $no_unsubscribe = false;
+  }
+
+  if(!$no_unsubscribe) {
   $url_unsubscribe = url('autoresponder/unsubscribe/'.$u->setid.'/'.$u->uid.'/'.$hash, NULL, NULL, TRUE);
   $url_view = url('autoresponder/mail/'.$u->setid.'/'.$mail->id.'/'.$u->uid.'/'.$hash, NULL, NULL, TRUE);
   $mail->body .= "<br /><small>-------------------------<br />To view this message in the web follow this link <a href='$url_view'>$url_view</a></small>";
   $mail->body .= "<br /><small>To unsubscribe from the list follow this link <a href='$url_unsubscribe'>$url_unsubscribe</a></small>";
+  }
+
   watchdog('autoresponder', "Email sended to <i>$mail->to</i> with subject <i>$mail->subject</i>");
   return mimemail($from, $mail->to, $mail->subject, $mail->body, $plain_text_only, $headers, $plain_text_body);
 }
@@ -900,7 +908,7 @@ function autoresponder_role_massmail_for
     $mail->uid = $u->uid;
     $mail->subject = $form_values['subject'];
     $mail->body = $form_values['body'];
-    autoresponder_mail($u, $mail);
+    autoresponder_mail($u, $mail, true);
     unset($mail);
   }
   drupal_set_message(t('Messages successfully sent!'));