Index: modules/subscriptions.module
===================================================================
--- modules/subscriptions.module	(revision 360)
+++ modules/subscriptions.module	(working copy)
@@ -31,8 +31,8 @@
 }
 
 // this section will be commented out until the mailqueue module is completed
-/*
-function subscriptions_settings() {
+//
+function subscriptions_settings2() {
   $mailevent = "This variable sets the event that will initiate the sending of update notification.  ";
   $mailevent .= "By default, subscription noticies are sent out as soon as a subscribed ";
   $mailevent .= "node recieved a comment.  This may be inefficient for some large sites.";
@@ -48,7 +48,7 @@
   }
   return $output;
 }
-*/
+//
 
 /**
  * Implementation of hook_user().
@@ -72,7 +72,7 @@
     $select[$vocabulary->vid] = $vocabulary->name;
   }
   $output = form_select(t('Omitted vocabularies'), 'subscriptions_omitted_taxa', variable_get('subscriptions_omitted_taxa', array()), $select, t('Select vocabularies which should be <strong>omitted</strong> from subscription listings.'), '', 1);
-  return $output;
+  return $output . subscriptions_settings2();
 }
 
 /**
@@ -240,7 +240,7 @@
       $locale = $initial_locale;
 
       if (variable_get('subscriptions_event', 'insert') == 'queue' && module_exist('mailqueue')) {
-        mailqueue_insert($uid, $subject, null, $body, 1);
+        mailqueue_insert($subscriptions->mail, $subject, $body, $headers, t('subscription notification for %who', array('%who' => '"'. $subscriptions->name .'" &lt;'. $subscriptions->mail .'&gt;')));
       }
       else {
         subscriptions_sendmail($subscriptions->name, $subscriptions->mail, $subject, $body, $headers);
