Index: notifications_autosubscribe.module
===================================================================
--- notifications_autosubscribe.module	(revision 6533)
+++ notifications_autosubscribe.module	(working copy)
@@ -4,7 +4,7 @@
  * Subscription_autosubscribe module allow users to automatically subscribe to threads they create. Used by
  * notifications_content.
  */
- 
+
 /**
  * Subscribes users to content they post, if not already subscribed
  *
@@ -28,7 +28,7 @@
       'event_type' => $event_type,
       'fields' => array($field => $value),
     );
-    notifications_save_subscription($subscription);    
+    notifications_save_subscription($subscription);
   }
 }
 
@@ -38,6 +38,7 @@
  * Adds autosubscribe checkbox to user edit form.
  */
 function notifications_autosubscribe_form_alter(&$form, $form_state, $form_id) {
+  global $user;
   switch ($form_id) {
     case 'user_edit':
     case 'user_profile_form':
@@ -56,13 +57,49 @@
         '#title'         => t('Set all users to "autosubscribe" by default'),
         '#default_value' => variable_get('notifications_default_auto', 0),
         '#description'   => t('Sets each users "autosubscribe" profile option.'),
-        '#weight' => -10,
+        '#weight'        => -10,
       );
       break;
+    case (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id):
+      // only show this if the user does not have auto subscribe enabled
+      if (!notifications_user_setting('auto', $user)) {
+      	$form['notifications_autosubscribe'] = array(
+	  '#type'        => 'fieldset',
+	  '#title'       => t('Subscriptions'),
+	  '#collapsible' => TRUE,
+	  '#collapsed'   => FALSE,
+	  '#weight'      => 1,
+	);
+        $form['notifications_autosubscribe']['notifications_autosubscribe_subscribe'] = array(
+          '#type'          => 'checkbox',
+          '#title'         => t('Subscribe'),
+          '#description'   => t('Receive notification of replies or comments to this node.'),
+          '#default_value' => 0,
+        );
+      }
+      break;
   }
 }
 
 /**
+ * Implementation of hook_nodeapi()
+ */
+function notifications_autosubscribe_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
+  global $user;
+  if ($op == 'insert') {
+    if (isset($node->notifications_autosubscribe_subscribe) && $node->notifications_autosubscribe_subscribe) {
+      $subscription = array(
+        'uid' => $user->uid,
+        'type' => 'thread',
+        'event_type' => 'node',
+        'fields' => array('nid' => $node->nid),
+      );
+      notifications_save_subscription($subscription);
+    }
+  }
+}
+
+/**
  * Implementation of hook_notifications.
  */
 function notifications_autosubscribe_notifications($op, $arg0, $arg1 = NULL, $arg2 = NULL) {
@@ -76,7 +113,7 @@
 
 /**
  * Implementation of hook_notifications_node_form_alter
- * 
+ *
  * Replace normal 'thread' subscription by autosubscribe option
  */
 function notifications_autosubscribe_notifications_node_form_alter(&$form) {