--- subscriptions_content.module	2009-02-14 01:05:49.000000000 -0700
+++ subscriptions_content1.module	2009-02-17 10:10:52.000000000 -0700
@@ -189,7 +189,13 @@ function subscriptions_content_nodeapi(&
   switch ($op) {
     case 'prepare':
       $unpublished_nid = ($node->status ? NULL : $node->nid);
-      $node->subscriptions_notify = TRUE;
+      if ($node->status) {
+        $node->subscriptions_notify = (boolean) variable_get('subscriptions_default_send_node_update_notifications', 1);
+      }
+      else {
+        $node->subscriptions_notify = (boolean) variable_get('subscriptions_default_send_node_insert_notifications', 1);
+      }
+
       break;
 
     case 'update':
@@ -370,6 +376,20 @@ function subscriptions_content_form_subs
     '#description'   => t('Nodes of %Static_content_types may end up with no %Subscribe options at all. Turn this option on to avoid displaying %Subscribe links in this case. The default is OFF, because this option causes processing overhead for each node view operation.', array('%Static_content_types' => t('Static content types'), '%Subscribe' => t('Subscribe'))),
   );
 
+  $form['content']['subscriptions_default_send_node_update_notifications'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Send notifications on node updates by default'),
+    '#default_value' => variable_get('subscriptions_default_send_node_update_notifications', 1),
+    '#description'   => t("Sets the default value of the \"Send subscriptions notifications\" checkbox on the node form when updating a node."),
+  );
+
+  $form['content']['subscriptions_default_send_node_insert_notifications'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Send notifications on node inserts by default'),
+    '#default_value' => variable_get('subscriptions_default_send_node_insert_notifications', 1),
+    '#description'   => t("Sets the default value of the \"Send subscriptions notifications\" checkbox on the node form when creating a node."),
+  );
+  
   $form['content']['subscriptions_generate_full_node'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Generate the %full_node variable', array('%full_node' => '!full_node')),