diff --git a/nixtape/register.php b/nixtape/register.php
index 47092b5f80e746c9a9f47211601211ff74c413eb..2255fcb6d19fa329a548305ab46292229d1519f2 100644
--- a/nixtape/register.php
+++ b/nixtape/register.php
@@ -33,7 +33,16 @@ if ($registration_disabled == true) {
 }
 
 function sendEmail($to, $subject, $message) {
-	mail($to, $subject, $message);
+
+        $foo = parse_url($base_url);
+
+        $domain = $foo['host'];
+
+        $headers = 'From: do-not-reply@' . $domain . "\r\n" .
+        'Reply-To: do-not-reply@' . $domain . "\r\n" .
+        'X-Mailer: GNU FM';
+     
+	mail($to, $subject, $message, $headers);
 }
 
 if (isset($_GET['auth'])) {