--- a/src/context.h	Sun Jul 10 14:19:00 2005 -0700
+++ b/src/context.h	Wed Jul 13 23:04:14 2005 -0700
@@ -8,9 +8,7 @@
 enum status {oksofar,       // not rejected yet
              white,         // whitelisted
              black,         // blacklisted
-             reject,        // rejected by a dns list
-             reject_tag,    // too many bad html tags
-             reject_host};  // too many hosts/urls in body
+             reject};       // rejected by a dns list
 
 class DNSBL;
 class CONTEXT;
@@ -70,7 +68,7 @@
     void        add_from_context(char *from, CONTEXTP con)  {env_from_context[from] = con;};
     void        set_from_default(char *status)              {env_from_default = status;};
     char*       find_from(char *from);
-    CONTEXTP    find_from_context(char *from);
+    CONTEXTP    find_context(char *from);
     CONTEXTP    find_from_context_name(char *name);
 
     void        set_content_filtering(bool filter)          {content_filtering = filter;};
@@ -122,8 +120,8 @@
     CONFIG();
     ~CONFIG();
     void        add_context(CONTEXTP con);
-    void        add_to(char *to, CONTEXTP con)      {env_to[to] = con;};
-    CONTEXTP    find_context(char *to, char *from);
+    void        add_to(char *to, CONTEXTP con);
+    CONTEXTP    find_context(char *to);
 
     char*       get_content_suffix()                        {return default_context->get_content_suffix()      ;};
     char*       get_content_message()                       {return default_context->get_content_message()     ;};
@@ -152,6 +150,7 @@
 extern char *token_include;
 extern char *token_inherit;
 extern char *token_lbrace;
+extern char *token_mailhost;
 extern char *token_many;
 extern char *token_off;
 extern char *token_ok;
@@ -160,6 +159,7 @@
 extern char *token_rbrace;
 extern char *token_semi;
 extern char *token_soft;
+extern char *token_substitute;
 extern char *token_tld;
 extern char *token_unknown;
 extern char *token_white;