diff --git a/inc/base.php b/inc/base.php
index 259b20c..bf33216 100644
--- a/inc/base.php
+++ b/inc/base.php
@@ -472,6 +472,6 @@ function handle_exception($e)
         print_r(serialize($_SERVER));
     } else {
         $msg = "Exception caught:\n" . $e->getMessage() . "\n" . serialize($_POST) . "\n" . serialize($_SERVER);
-        mail(config("adminmail"), "Exception on configinterface", $msg);
+        send_mail(config("adminmail"), "Exception on configinterface", $msg);
     }
 }
diff --git a/modules/contacts/include/contacts.php b/modules/contacts/include/contacts.php
index 4c8df42..2220fd5 100644
--- a/modules/contacts/include/contacts.php
+++ b/modules/contacts/include/contacts.php
@@ -287,8 +287,8 @@ function send_emailchange_token($id, $email)
 
 https://schokokeks.org
 ';
-    # send welcome message
-    mail($email, '=?UTF-8?Q?Best=C3=A4tigung_Ihrer_E-Mail-Adresse?=', $message, "X-schokokeks-org-message: verify\nFrom: " . config('company_name') . ' <' . config('adminmail') . ">\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\n");
+    // send welcome message
+    send_mail($email, 'Bestätigung Ihrer E-Mail-Adresse', $message, "verify");
 }
 
 function update_pending($contactid)
diff --git a/modules/email/include/vmail.php b/modules/email/include/vmail.php
index a2b7ff7..313c690 100644
--- a/modules/email/include/vmail.php
+++ b/modules/email/include/vmail.php
@@ -419,10 +419,10 @@ function save_vmail_account($account)
   (Achten Sie bitte darauf, dass die Verschlüsselung mit SSL oder TLS 
   aktiviert ist.)
 ';
-        # send welcome message
-        mail($emailaddr, 'Ihr neues Postfach ist bereit', $message, "X-schokokeks-org-message: welcome\nFrom: " . config('company_name') . ' <' . config('adminmail') . ">\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\n");
-        # notify the vmail subsystem of this new account
-        #mail('vmail@'.config('vmail_server'), 'command', "user={$account['local']}\nhost={$domainname}", "X-schokokeks-org-message: command");
+        // send welcome message
+        send_mail($emailaddr, 'Ihr neues Postfach ist bereit', $message, "welcome");
+        // notify the vmail subsystem of this new account
+        //mail('vmail@'.config('vmail_server'), 'command', "user={$account['local']}\nhost={$domainname}", "X-schokokeks-org-message: command");
     }
 
     // Clean up obsolete quota
diff --git a/modules/vhosts/include/vhosts.php b/modules/vhosts/include/vhosts.php
index 8e18809..1d0e0b9 100644
--- a/modules/vhosts/include/vhosts.php
+++ b/modules/vhosts/include/vhosts.php
@@ -358,7 +358,7 @@ function make_webapp_vhost($id, $webapp)
     $webapp_name = $result->fetch(PDO::FETCH_OBJ)->displayname;
     logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'vhosts', 'Setting up webapp ' . $webapp_name . ' on vhost #' . $id);
     db_query("REPLACE INTO vhosts.webapps (vhost, webapp) VALUES (?, ?)", [$id, $webapp]);
-    mail('webapps-setup@schokokeks.org', 'setup', 'setup');
+    send_mail('webapps-setup@schokokeks.org', 'setup', 'setup');
 }