diff --git a/inc/media.php b/inc/media.php
index dcef25cfde4cca5ce9ea4bad60b726d22511d01c..10da501b08e625717401b1c2fd15a2faace57c62 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -435,7 +435,11 @@ function media_notify($id,$file,$mime){
     $text = str_replace('@MEDIA@',ml($id,'',true,'&',true),$text);
     $text = str_replace('@SIZE@',filesize_h(filesize($file)),$text);
 
-    $subject = '['.$conf['title'].'] '.$lang['mail_upload'].' '.$id;
+    if(empty($conf['mailprefix'])) {
+        $subject = '['.$conf['title'].'] '.$lang['mail_upload'].' '.$id;
+    } else {
+        $subject = '['.$conf['mailprefix'].'] '.$lang['mail_upload'].' '.$id;
+    }
 
     mail_send($conf['notify'],$subject,$text,$conf['mailfrom']);
 }