diff --git a/inc/subscription.php b/inc/subscription.php
index 6d62e4ced24f11248aadcf4256bbec282e415975..62cfd1509315e05bcb5542481ca9138236dc84e1 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -554,7 +554,9 @@ class Subscription {
         $mail->bcc($subscriber_mail);
         $mail->subject($subject);
         $mail->setBody($text, $trep, $hrep);
-        $mail->from($conf['mailfromnobody']);
+        if(in_array($template, array('subscr_list', 'subscr_digest'))){
+            $mail->from($conf['mailfromnobody']);
+        }
         if(isset($trep['SUBSCRIBE'])) {
             $mail->setHeader('List-Unsubscribe', '<'.$trep['SUBSCRIBE'].'>', false);
         }