diff --git a/inc/common.php b/inc/common.php
index 711df9d11829f503e15f98d00f5fdb1b0e5de1c6..8ca29b9189bd8b4ed2376e7e2626a810deebe7cc 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -810,6 +810,7 @@ function saveOldRevision($id){
 function notify($id,$who,$rev='',$summary='',$minor=false,$replace=array()){
   global $lang;
   global $conf;
+  global $INFO;
 
   // decide if there is something to do
   if($who == 'admin'){
@@ -866,7 +867,12 @@ function notify($id,$who,$rev='',$summary='',$minor=false,$replace=array()){
   $text = str_replace('@DIFF@',$diff,$text);
   $subject = '['.$conf['title'].'] '.$subject;
 
-  mail_send($to,$subject,$text,$conf['mailfrom'],'',$bcc);
+  $from = $conf['mailfrom'];
+  $from = str_replace('@USER@',$_SERVER['REMOTE_USER'],$from);
+  $from = str_replace('@NAME@',$INFO['userinfo']['name'],$from);
+  $from = str_replace('@MAIL@',$INFO['userinfo']['mail'],$from);
+
+  mail_send($to,$subject,$text,$from,'',$bcc);
 }
 
 /**