diff --git a/inc/common.php b/inc/common.php
index 673afc1a65cde8dfc491621d6f59546123af3e51..b473953330a4576775f3c87e6fdb880c50aed955 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -368,7 +368,7 @@ function exportlink($id='',$format='raw',$more='',$abs=false,$sep='&'){
  *
  * Will return a link to the detail page if $direct is false
  */
-function ml($id='',$more='',$direct=true,$sep='&'){
+function ml($id='',$more='',$direct=true,$sep='&',$abs=false){
   global $conf;
   if(is_array($more)){
     $more = buildURLparams($more,$sep);
@@ -376,7 +376,11 @@ function ml($id='',$more='',$direct=true,$sep='&'){
     $more = str_replace(',',$sep,$more);
   }
 
-  $xlink = DOKU_BASE;
+  if($abs){
+    $xlink = DOKU_URL;
+  }else{
+    $xlink = DOKU_BASE;
+  }
 
   // external URLs are always direct without rewriting
   if(preg_match('#^(https?|ftp)://#i',$id)){
diff --git a/inc/media.php b/inc/media.php
index c25c214f4c91d05f6e484cbbce30e361686f6179..25dc03ffa0c496a6a523c39409252790747e7f22 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -311,7 +311,7 @@ function media_notify($id,$file,$mime){
     $text = str_replace('@DOKUWIKIURL@',DOKU_URL,$text);
     $text = str_replace('@USER@',$_SERVER['REMOTE_USER'],$text);
     $text = str_replace('@MIME@',$mime,$text);
-    $text = str_replace('@MEDIA@',DOKU_URL.ml($id,'',true,'&'),$text);
+    $text = str_replace('@MEDIA@',ml($id,'',true,'&',true),$text);
     $text = str_replace('@SIZE@',filesize_h(filesize($file)),$text);
 
     $from = $conf['mailfrom'];