diff --git a/include/config.php.sample b/include/config.php.sample
index 13c4751..e34e2a2 100644
--- a/include/config.php.sample
+++ b/include/config.php.sample
@@ -17,6 +17,7 @@ define("APPDB_ROOT", "http://appdb.winehq.org/");  // path to AppDB
 define("APPDB_OWNER","WineHQ"); // with what product/company is this AppDB related ?
 define("APPDB_OWNER_URL","http://www.winehq.org/"); // website of this product/company
 define("APPDB_OWNER_EMAIL","appdb@winehq.org"); // e-mail of this product/company
+define("APPDB_SENDER_EMAIL","appdb-noreply@winehq.org"); // The e-mail address which appears as the sender in mails sent by the AppDB
 define("BUGZILLA_ROOT","http://bugs.winehq.org/"); // path to bugzilla
 
 // AppDB developers: Use this define to disable email from being sent from the appdb during testing
diff --git a/include/mail.php b/include/mail.php
index f4c4d44..cb9507a 100644
--- a/include/mail.php
+++ b/include/mail.php
@@ -9,8 +9,8 @@ function mail_appdb($sEmailList,$sSubject,$sMsg)
         return;
 
     $sHeaders  = "MIME-Version: 1.0\r\n";
-    $sHeaders .= "From: AppDB <".APPDB_OWNER_EMAIL.">\r\n";
-    $sHeaders .= "Reply-to: AppDB <".APPDB_OWNER_EMAIL.">\r\n";
+    $sHeaders .= "From: AppDB <".APPDB_SENDER_EMAIL.">\r\n";
+    $sHeaders .= "Reply-to: AppDB <".APPDB_SENDER_EMAIL.">\r\n";
     $sHeaders .= "X-Priority: 3\r\n";
     $sHeaders .= "X-Mailer: ".APPDB_OWNER." mailer\r\n";
     $sMsg  = trim(ereg_replace("\r\n","\n",$sMsg));
@@ -32,7 +32,7 @@ function mail_appdb($sEmailList,$sSubject,$sMsg)
         return;
     }
 
-    $bResult = mail(str_replace(" ",",",$sEmailList), "[AppDB] ".$sSubject, $sMsg, $sHeaders, "-f".APPDB_OWNER_EMAIL);
+    $bResult = mail(str_replace(" ",",",$sEmailList), "[AppDB] ".$sSubject, $sMsg, $sHeaders, "-f".APPDB_SENDER_EMAIL);
     if($bResult)
         addmsg("Message sent to: ".$sEmailList, "green");
     else