diff --git a/mozilla/webtools/bugzilla/checksetup.pl b/mozilla/webtools/bugzilla/checksetup.pl
index ee61522cb08..e6e5c398f1c 100755
--- a/mozilla/webtools/bugzilla/checksetup.pl
+++ b/mozilla/webtools/bugzilla/checksetup.pl
@@ -821,7 +821,7 @@ if ($my_create_htaccess) {
     open HTACCESS, ">.htaccess";
     print HTACCESS <<'END';
 # don't allow people to retrieve non-cgi executable files or our private data
-<FilesMatch ^(.*\.pl|.*localconfig.*|processmail|runtests.sh)$>
+<FilesMatch ^(.*\.pl|.*localconfig.*|runtests.sh)$>
   deny from all
 </FilesMatch>
 <FilesMatch ^(localconfig.js|localconfig.rdf)$>
@@ -1107,7 +1107,7 @@ WriteParams();
 #
 
 # These are the files which need to be marked executable
-my @executable_files = ('processmail', 'whineatnews.pl', 'collectstats.pl',
+my @executable_files = ('whineatnews.pl', 'collectstats.pl',
    'checksetup.pl', 'importxml.pl', 'runtests.sh');
 
 # tell me if a file is executable.  All CGI files and those in @executable_files
diff --git a/mozilla/webtools/bugzilla/importxml.pl b/mozilla/webtools/bugzilla/importxml.pl
index 6575e2f62ad..50139ba40bc 100755
--- a/mozilla/webtools/bugzilla/importxml.pl
+++ b/mozilla/webtools/bugzilla/importxml.pl
@@ -62,6 +62,7 @@ use lib ($::path);
 use XML::Parser;
 use Data::Dumper;
 $Data::Dumper::Useqq = 1;
+use Bugzilla::BugMail;
 
 require "CGI.pl";
 require "globals.pl";
@@ -648,7 +649,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
     $log .= "\n\n\n";
   }
 
-  system("./processmail", $id, $exporter);
+  Bugzilla::BugMail::Send($id, { 'changer' => $exporter });
 }
 
 my $subject = "$bugqty bug(s) successfully moved from $urlbase to " 
diff --git a/mozilla/webtools/bugzilla/move.pl b/mozilla/webtools/bugzilla/move.pl
index 7d3d845530c..f1777c8fef1 100755
--- a/mozilla/webtools/bugzilla/move.pl
+++ b/mozilla/webtools/bugzilla/move.pl
@@ -30,6 +30,7 @@ require "CGI.pl";
 use vars qw($template $userid %COOKIE);
 
 use Bug;
+use Bugzilla::BugMail;
 
 $::lockcount = 0;
 
@@ -132,7 +133,7 @@ foreach my $id (split(/:/, $::FORM{'buglist'})) {
         "($id,  $exporterid, now(), " . SqlQuote($comment) . ")");
 
     print "<P>Bug $id moved to " . Param("move-to-url") . ".<BR>\n";
-    system("./processmail", $id, $exporter);
+    Bugzilla::BugMail::Send($id, { 'changer' => $exporter });
   }
 }
 print "<P>\n";
diff --git a/mozilla/webtools/bugzilla/post_bug.cgi b/mozilla/webtools/bugzilla/post_bug.cgi
index 2a2bcb5fa00..c319e802431 100755
--- a/mozilla/webtools/bugzilla/post_bug.cgi
+++ b/mozilla/webtools/bugzilla/post_bug.cgi
@@ -205,7 +205,7 @@ my %ccids;
 my @cc;
 
 # Create the ccid hash for inserting into the db
-# and the list for passing to processmail
+# and the list for passing to Bugzilla::BugMail::Send
 # use a hash rather than a list to avoid adding users twice
 if (defined $::FORM{'cc'}) {
     foreach my $person (split(/[ ,]/, $::FORM{'cc'})) {
diff --git a/mozilla/webtools/bugzilla/process_bug.cgi b/mozilla/webtools/bugzilla/process_bug.cgi
index cce3792eec1..8567673817b 100755
--- a/mozilla/webtools/bugzilla/process_bug.cgi
+++ b/mozilla/webtools/bugzilla/process_bug.cgi
@@ -1398,7 +1398,7 @@ foreach my $id (@idlist) {
         @ccRemoved = @removed;
     }
 
-    # We need to run processmail for dependson/blocked bugs if the dependencies
+    # We need to send mail for dependson/blocked bugs if the dependencies
     # change or the status or resolution change. This var keeps track of that.
     my $check_dep_bugs = 0;
 
@@ -1586,7 +1586,7 @@ foreach my $id (@idlist) {
         $newhash{$col} = $newvalues[$i];
         $i++;
     }
-    # for passing to processmail to ensure that when someone is removed
+    # for passing to Bugzilla::BugMail to ensure that when someone is removed
     # from one of these fields, they get notified of that fact (if desired)
     #
     my $origOwner = "";
@@ -1612,8 +1612,8 @@ foreach my $id (@idlist) {
                 $col = 'component';
             }
 
-            # save off the old value for passing to processmail so the old
-            # owner can be notified
+            # save off the old value for passing to Bugzilla::BugMail so
+            # the old owner can be notified
             #
             if ($col eq 'assigned_to') {
                 $old = ($old) ? DBID_to_name($old) : "";