Index: subscriptions.module
===================================================================
--- subscriptions.module	(revision 34)
+++ subscriptions.module	(working copy)
@@ -114,6 +114,28 @@
     '#description'   => t('Select content types which should be <strong>omitted</strong> from subscription listings.'),
     '#multiple'      => TRUE
   );
+  
+  $form['sub_settings']['email'] = array(
+    '#type'=>'fieldset',
+    '#title' => 'Email settings for subscriptions notification',
+    '#collapsible'=>true,
+    '#collapsed'=>true,
+  );
+  $form['sub_settings']['email']['subscriptions_email_subject'] = array(
+    '#type'          => 'textfield',
+    '#title'         => t('Subject'),
+    '#default_value' => variable_get('subscriptions_email_subject', "")
+  );
+  $form['sub_settings']['email']['subscriptions_email_body'] = array(
+    '#type'          => 'textarea',
+    '#title'         => t('Body'),
+    '#default_value' => variable_get('subscriptions_email_body', ""),
+    '#description'   => t("You may use the following variables: %name (user's name), %type (node type subscribed to),
+            %url (the url of the subscribed node), %site (the url of your site), %manage-url (the url to manage user's 
+            subscriptions), %title (the node's title), %teaser (the node's teaser)"),
+    '#rows'          => 15,
+    ); 
+  
   $form['sub_settings']['subscriptions_sendself'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Notify poster of own posts'),
@@ -411,14 +433,20 @@
         $locale = $subscriptions->language;
       }
       $headers = "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from";
-      $subject = t('[%site] %type subscription update for %name : %subject', array('%site' => variable_get('site_name', 'drupal'), '%type' => $strtype, '%name' => $subscriptions->name, '%subject' => $subj));
-      $body = t("Greetings, %name.\n\nA %type to which you have subscribed has been updated.\n%title\n%teaser\nTo view the thread, navigate to %url \n\n--\nThis is an automatic message from %site.\nTo manage your subscriptions, browse to %manage-url",
-      array('%name' => $subscriptions->name,
-			'%type' => t($strtype),
-      '%url' => url('node/'. $nid, NULL, $cid, 1),
-      '%site' => t(variable_get('site_name', 'drupal')),
-      '%manage-url' => url('subscriptions', NULL, NULL, 1),
-      '%title' => $nobj->title, '%teaser'=> $teaser));
+      $setting_subject = variable_get('subscriptions_email_subject', "");
+      $setting_body    = variable_get('subscriptions_email_body', "");  
+      $subject = t($setting_subject, 
+          array('%site' => variable_get('site_name', 'drupal'), '%type' => $strtype, 
+          '%name' => $subscriptions->name, '%subject' => $subj));
+      $body = t($setting_body,
+          array(
+            '%name' => $subscriptions->name,
+		    '%type' => t($strtype),
+            '%url' => url('node/'. $nid, NULL, $cid, 1),
+            '%site' => t(variable_get('site_name', 'drupal')),
+            '%manage-url' => url('subscriptions', NULL, NULL, 1),
+            '%title' => $nobj->title,
+            '%teaser'=> $teaser));
       // revert to original locale
       $locale = $initial_locale;
       subscriptions_sendmail($subscriptions->name, $subscriptions->mail, $subject, $body, $headers);