X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=94a0f4902b0ba3c441e0cfe915b6c740fd985711;hb=5367620467f690774966c77cf5049ace9e6552a8;hp=c69545bbd13ee112622b7d371b700b3255546676;hpb=097620b62799c96d610d73410ec07a6b8cdf82f0;p=friendica.git

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index c69545bbd1..94a0f4902b 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -176,7 +176,7 @@ class Delivery
 				&& empty($parent['allow_gid'])
 				&& empty($parent['deny_cid'])
 				&& empty($parent['deny_gid'])
-				&& !$parent["private"]) {
+				&& ($parent["private"] != Model\Item::PRIVATE)) {
 				$public_message = true;
 			}
 		}
@@ -564,7 +564,8 @@ class Delivery
 				$headers  = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n";
 			}
 		} else {
-			$headers  = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . DI::baseUrl()->getHostname() . '>' . "\n";
+			$sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHostname());
+			$headers  = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <' . $sender . '>' . "\n";
 		}
 
 		$headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n";