Index: subscriptions_mail.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/subscriptions/Attic/subscriptions_mail.module,v
retrieving revision 1.1.2.10
diff -u -p -r1.1.2.10 subscriptions_mail.module
--- subscriptions_mail.module	21 Feb 2008 22:45:46 -0000	1.1.2.10
+++ subscriptions_mail.module	6 Mar 2008 23:09:39 -0000
@@ -74,8 +74,13 @@ function subscriptions_mail_cron() {
             }
           }
           else {
-            $body_template = variable_get('subscriptions_email_body', SUBSCRIPTIONS_DEFAULT_BODY);
-            $subject_template = variable_get('subscriptions_email_subject', SUBSCRIPTIONS_DEFAULT_SUBJECT);
+            if ($templates = db_fetch_object(db_query("SELECT * FROM {mail_edit} WHERE mailkey = '%s'", $mailkey))) {
+              $subject_template = $templates->subject;
+              $body_template = $templates->body;
+            } else {
+              $body_template = variable_get('subscriptions_email_body', SUBSCRIPTIONS_DEFAULT_BODY);
+              $subject_template = variable_get('subscriptions_email_subject', SUBSCRIPTIONS_DEFAULT_SUBJECT);
+            }
           }
           $base = 'user/'. $s['uid'] .'/';
           $mailvars = array(