diff --git a/boot.php b/boot.php
index 84bb9741e6..1ca8b8d8d8 100644
--- a/boot.php
+++ b/boot.php
@@ -486,16 +486,6 @@ define('SR_SCOPE_TAGS', 'tags');
  */
 define('NULL_DATE', '0001-01-01 00:00:00');
 
-/**
- * Deliver commands
- */
-define('DELIVER_MAIL',       'mail');
-define('DELIVER_SUGGESTION', 'suggest');
-define('DELIVER_RELOCATION', 'relocate');
-define('DELIVER_DELETION',   'drop');
-define('DELIVER_POST',       'wall-new');
-define('DELIVER_COMMENT',    'comment-new');
-
 // Normally this constant is defined - but not if "pcntl" isn't installed
 if (!defined("SIGTERM")) {
 	define("SIGTERM", 15);
diff --git a/src/Model/Item.php b/src/Model/Item.php
index aa3800cbe1..e7fd115dd1 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -866,7 +866,6 @@ class Item extends BaseObject
 		unset($item['mention']);
 		unset($item['wall']);
 		unset($item['origin']);
-		unset($item['global']);
 		unset($item['starred']);
 		unset($item['rendered-hash']);
 		unset($item['rendered-html']);
@@ -976,10 +975,15 @@ class Item extends BaseObject
 
 			if (!dba::exists('item', ['uri' => $item['uri'], 'uid' => 0])) {
 				// Preparing public shadow (removing user specific data)
-				unset($item['id']);
 				$item['uid'] = 0;
-				$item['origin'] = 0;
-				$item['wall'] = 0;
+				unset($item['id']);
+				unset($item['parent']);
+				unset($item['wall']);
+				unset($item['mention']);
+				unset($item['origin']);
+				unset($item['starred']);
+				unset($item['rendered-hash']);
+				unset($item['rendered-html']);
 				if ($item['uri'] == $item['parent-uri']) {
 					$item['contact-id'] = Contact::getIdForURL($item['owner-link']);
 				} else {
@@ -1033,11 +1037,20 @@ class Item extends BaseObject
 			return;
 		}
 
+		// Save "origin" and "parent" state
+		$origin = $item['origin'];
+		$parent = $item['parent'];
+
 		// Preparing public shadow (removing user specific data)
-		unset($item['id']);
 		$item['uid'] = 0;
-		$item['origin'] = 0;
-		$item['wall'] = 0;
+		unset($item['id']);
+		unset($item['parent']);
+		unset($item['wall']);
+		unset($item['mention']);
+		unset($item['origin']);
+		unset($item['starred']);
+		unset($item['rendered-hash']);
+		unset($item['rendered-html']);
 		$item['contact-id'] = Contact::getIdForURL($item['author-link']);
 
 		if (in_array($item['type'], ["net-comment", "wall-comment"])) {
@@ -1049,6 +1062,14 @@ class Item extends BaseObject
 		$public_shadow = self::insert($item, false, false, true);
 
 		logger("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, LOGGER_DEBUG);
+
+		// If this was a comment to a Diaspora post we don't get our comment back.
+		// This means that we have to distribute the comment by ourselves.
+		if ($origin) {
+			if (dba::exists('item', ['id' => $parent, 'network' => NETWORK_DIASPORA])) {
+				self::distribute($public_shadow);
+			}
+		}
 	}
 
 	 /**
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 74975159ea..f233f158a9 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1405,25 +1405,27 @@ class DFRN
 	{
 		$a = get_app();
 
-		if (empty($contact['addr'])) {
-			logger('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.');
-			if (Contact::updateFromProbe($contact['id'])) {
-				$new_contact = dba::selectFirst('contact', ['addr'], ['id' => $contact['id']]);
-				$contact['addr'] = $new_contact['addr'];
-			}
-
+		if (!$public_batch) {
 			if (empty($contact['addr'])) {
-				logger('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']);
-				Contact::markForArchival($contact);
-				return -21;
-			}
-		}
+				logger('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.');
+				if (Contact::updateFromProbe($contact['id'])) {
+					$new_contact = dba::selectFirst('contact', ['addr'], ['id' => $contact['id']]);
+					$contact['addr'] = $new_contact['addr'];
+				}
 
-		$fcontact = Diaspora::personByHandle($contact['addr']);
-		if (empty($fcontact)) {
-			logger('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
-			Contact::markForArchival($contact);
-			return -22;
+				if (empty($contact['addr'])) {
+					logger('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']);
+					Contact::markForArchival($contact);
+					return -21;
+				}
+			}
+
+			$fcontact = Diaspora::personByHandle($contact['addr']);
+			if (empty($fcontact)) {
+				logger('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
+				Contact::markForArchival($contact);
+				return -22;
+			}
 		}
 
 		$envelope = Diaspora::buildMessage($atom, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch);
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 6f03c0df87..61d1a586fa 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -596,9 +596,9 @@ class Diaspora
 		}
 
 		$importer = ["uid" => 0, "page-flags" => PAGE_FREELOVE];
-		$message_id = self::dispatch($importer, $msg, $fields);
+		$success = self::dispatch($importer, $msg, $fields);
 
-		return $message_id;
+		return $success;
 	}
 
 	/**
@@ -832,6 +832,10 @@ class Diaspora
 
 		if (isset($parent_author_signature)) {
 			$key = self::key($msg["author"]);
+			if (empty($key)) {
+				logger("No key found for parent author ".$msg["author"], LOGGER_DEBUG);
+				return false;
+			}
 
 			if (!Crypto::rsaVerify($signed_data, $parent_author_signature, $key, "sha256")) {
 				logger("No valid parent author signature for parent author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$parent_author_signature, LOGGER_DEBUG);
@@ -840,6 +844,10 @@ class Diaspora
 		}
 
 		$key = self::key($fields->author);
+		if (empty($key)) {
+			logger("No key found for author ".$fields->author, LOGGER_DEBUG);
+			return false;
+		}
 
 		if (!Crypto::rsaVerify($signed_data, $author_signature, $key, "sha256")) {
 			logger("No valid author signature for author ".$fields->author. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature, LOGGER_DEBUG);
@@ -2721,10 +2729,15 @@ class Diaspora
 	 */
 	public static function originalItem($guid, $orig_author)
 	{
+		if (empty($guid)) {
+			logger('Empty guid. Quitting.');
+			return false;
+		}
+
 		// Do we already have this item?
 		$fields = ['body', 'tag', 'app', 'created', 'object-type', 'uri', 'guid',
 			'author-name', 'author-link', 'author-avatar'];
-		$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false];
+		$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false];
 		$item = dba::selectfirst('item', $fields, $condition);
 
 		if (DBM::is_result($item)) {
@@ -2734,7 +2747,7 @@ class Diaspora
 			// Then refetch the content, if it is a reshare from a reshare.
 			// If it is a reshared post from another network then reformat to avoid display problems with two share elements
 			if (self::isReshare($item["body"], true)) {
-				$r = [];
+				$item = [];
 			} elseif (self::isReshare($item["body"], false) || strstr($item["body"], "[share")) {
 				$item["body"] = Markdown::toBBCode(BBCode::toMarkdown($item["body"]));
 
@@ -2749,21 +2762,26 @@ class Diaspora
 			}
 		}
 
-		if (!DBM::is_result($r)) {
-			$server = "https://".substr($orig_author, strpos($orig_author, "@") + 1);
-			logger("1st try: reshared message ".$guid." will be fetched via SSL from the server ".$server);
-			$item_id = self::storeByGuid($guid, $server);
-
-			if (!$item_id) {
-				$server = "http://".substr($orig_author, strpos($orig_author, "@") + 1);
-				logger("2nd try: reshared message ".$guid." will be fetched without SLL from the server ".$server);
-				$item_id = self::storeByGuid($guid, $server);
+		if (!DBM::is_result($item)) {
+			if (empty($orig_author)) {
+				logger('Empty author for guid ' . $guid . '. Quitting.');
+				return false;
 			}
 
-			if ($item_id) {
+			$server = "https://".substr($orig_author, strpos($orig_author, "@") + 1);
+			logger("1st try: reshared message ".$guid." will be fetched via SSL from the server ".$server);
+			$stored = self::storeByGuid($guid, $server);
+
+			if (!$stored) {
+				$server = "http://".substr($orig_author, strpos($orig_author, "@") + 1);
+				logger("2nd try: reshared message ".$guid." will be fetched without SSL from the server ".$server);
+				$stored = self::storeByGuid($guid, $server);
+			}
+
+			if ($stored) {
 				$fields = ['body', 'tag', 'app', 'created', 'object-type', 'uri', 'guid',
 					'author-name', 'author-link', 'author-avatar'];
-				$condition = ['id' => $item_id, 'visible' => true, 'deleted' => false];
+				$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false];
 				$item = dba::selectfirst('item', $fields, $condition);
 
 				if (DBM::is_result($item)) {
diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index e8c21fb38d..f874e5f230 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -4,6 +4,7 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
@@ -19,82 +20,67 @@ use dba;
 
 require_once 'include/items.php';
 
-/// @todo This is some ugly code that needs to be split into several methods
+class Delivery extends BaseObject
+{
+	const MAIL =       'mail';
+	const SUGGESTION = 'suggest';
+	const RELOCATION = 'relocate';
+	const DELETION =   'drop';
+	const POST =       'wall-new';
+	const COMMENT =    'comment-new';
 
-class Delivery {
-	public static function execute($cmd, $item_id, $contact_id) {
-		global $a;
-
-		logger('delivery: invoked: '.$cmd.': '.$item_id.' to '.$contact_id, LOGGER_DEBUG);
+	public static function execute($cmd, $item_id, $contact_id)
+	{
+		logger('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $contact_id, LOGGER_DEBUG);
 
 		$top_level = false;
-		$recipients = [];
 		$followup = false;
+		$public_message = false;
 
-		$recipients[] = $contact_id;
-
-		if ($cmd == DELIVER_MAIL) {
+		if ($cmd == self::MAIL) {
 			$target_item = dba::selectFirst('mail', [], ['id' => $item_id]);
 			if (!DBM::is_result($message)) {
 				return;
 			}
 			$uid = $target_item['uid'];
-			$recipients[] = $target_item['contact-id'];
-		} elseif ($cmd == DELIVER_SUGGESTION) {
+		} elseif ($cmd == self::SUGGESTION) {
 			$target_item = dba::selectFirst('fsuggest', [], ['id' => $item_id]);
 			if (!DBM::is_result($message)) {
 				return;
 			}
 			$uid = $target_item['uid'];
-			$recipients[] = $target_item['contact-id'];
-		} elseif ($cmd == DELIVER_RELOCATION) {
+		} elseif ($cmd == self::RELOCATION) {
 			$uid = $item_id;
 		} else {
-			// find ancestors
-			$target_item = dba::fetch_first("SELECT `item`.*, `contact`.`uid` AS `cuid`,
-								`sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
-							FROM `item`
-							INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-							LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
-							WHERE `item`.`id` = ? AND `visible` AND NOT `moderated`", $item_id);
-
-			if (!DBM::is_result($target_item) || !intval($target_item['parent'])) {
+			$item = dba::selectFirst('item', ['parent'], ['id' => $item_id]);
+			if (!DBM::is_result($item) || empty($item['parent'])) {
 				return;
 			}
+			$parent_id = intval($item['parent']);
 
-			$parent_id = intval($target_item['parent']);
-			$uid = $target_item['cuid'];
-			$updated = $target_item['edited'];
-
-			$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
-				FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
-				WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC",
-				intval($parent_id)
-			);
-
-			if (!DBM::is_result($items)) {
-				return;
-			}
-
-			$icontacts = null;
-			$contacts_arr = [];
-			foreach ($items as $item) {
-				if (!in_array($item['contact-id'],$contacts_arr)) {
-					$contacts_arr[] = intval($item['contact-id']);
+			$itemdata = dba::p("SELECT `item`.*, `contact`.`uid` AS `cuid`,
+							`sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
+						FROM `item`
+						INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+						LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
+						WHERE `item`.`id` IN (?, ?) AND `visible` AND NOT `moderated`
+						ORDER BY `item`.`id`",
+					$item_id, $parent_id);
+			$items = [];
+			while ($item = dba::fetch($itemdata)) {
+				if ($item['id'] == $parent_id) {
+					$parent = $item;
 				}
+				if ($item['id'] == $item_id) {
+					$target_item = $item;
+				}
+				$items[] = $item;
 			}
-			if (count($contacts_arr)) {
-				$str_contacts = implode(',',$contacts_arr);
-				$icontacts = q("SELECT * FROM `contact`
-					WHERE `id` IN ( $str_contacts ) "
-				);
-			}
-			if (!DBM::is_result($icontacts)) {
-				return;
-			}
+			dba::close($itemdata);
+
+			$uid = $target_item['cuid'];
 
 			// avoid race condition with deleting entries
-
 			if ($items[0]['deleted']) {
 				foreach ($items as $item) {
 					$item['deleted'] = 1;
@@ -104,24 +90,10 @@ class Delivery {
 			// When commenting too fast after delivery, a post wasn't recognized as top level post.
 			// The count then showed more than one entry. The additional check should help.
 			// The check for the "count" should be superfluous, but I'm not totally sure by now, so we keep it.
-			if ((($items[0]['id'] == $item_id) || (count($items) == 1)) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
-				logger('delivery: top level post');
+			if ((($parent['id'] == $item_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) {
+				logger('Top level post');
 				$top_level = true;
 			}
-		}
-
-		$owner = User::getOwnerDataById($uid);
-		if (!$owner) {
-			return;
-		}
-
-		// We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora
-		$walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY);
-
-		$public_message = true;
-
-		if (!in_array($cmd, [DELIVER_MAIL, DELIVER_SUGGESTION, DELIVER_RELOCATION])) {
-			$parent = $items[0];
 
 			// This is IMPORTANT!!!!
 
@@ -131,9 +103,9 @@ class Delivery {
 			// if $parent['wall'] == 1 we will already have the parent message in our array
 			// and we will relay the whole lot.
 
-			$localhost = $a->get_hostname();
-			if (strpos($localhost,':')) {
-				$localhost = substr($localhost,0,strpos($localhost,':'));
+			$localhost = self::getApp()->get_hostname();
+			if (strpos($localhost, ':')) {
+				$localhost = substr($localhost, 0, strpos($localhost, ':'));
 			}
 			/**
 			 *
@@ -144,20 +116,25 @@ class Delivery {
 			 */
 
 			if (!$top_level && ($parent['wall'] == 0) && stristr($target_item['uri'], $localhost)) {
-				logger('followup '.$target_item["guid"], LOGGER_DEBUG);
+				logger('Followup ' . $target_item["guid"], LOGGER_DEBUG);
 				// local followup to remote post
 				$followup = true;
 			}
 
-			if (strlen($parent['allow_cid'])
-				|| strlen($parent['allow_gid'])
-				|| strlen($parent['deny_cid'])
-				|| strlen($parent['deny_gid'])
-				|| $parent["private"]) {
-				$public_message = false; // private recipients, not public
+			if (empty($parent['allow_cid'])
+				&& empty($parent['allow_gid'])
+				&& empty($parent['deny_cid'])
+				&& empty($parent['deny_gid'])
+				&& !$parent["private"]) {
+				$public_message = true;
 			}
 		}
 
+		$owner = User::getOwnerDataById($uid);
+		if (!DBM::is_result($owner)) {
+			return;
+		}
+
 		// We don't deliver our items to blocked or pending contacts, and not to ourselves either
 		$contact = dba::selectFirst('contact', [],
 			['id' => $contact_id, 'blocked' => false, 'pending' => false, 'self' => false]
@@ -166,23 +143,22 @@ class Delivery {
 			return;
 		}
 
-		$deliver_status = 0;
-
-		// Transmit via Diaspora if not possible via Friendica
-		if (($item['uid'] == 0) && ($contact['network'] == NETWORK_DFRN)) {
+		// Transmit via Diaspora if the thread had started as Diaspora post
+		// This is done since the uri wouldn't match (Diaspora doesn't transmit it)
+		if (isset($parent) && ($parent['network'] == NETWORK_DIASPORA) && ($contact['network'] == NETWORK_DFRN)) {
 			$contact['network'] = NETWORK_DIASPORA;
 		}
 
-		logger("Delivering " . $cmd . " followup=$followup - network ".$contact['network']);
+		logger("Delivering " . $cmd . " followup=$followup - via network " . $contact['network']);
 
 		switch ($contact['network']) {
 
 			case NETWORK_DFRN:
-				self::deliverDFRN($cmd, $contact, $icontacts, $owner, $items, $target_item, $public_message, $top_level, $followup);
+				self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
 				break;
 
 			case NETWORK_DIASPORA:
-				self::deliverDiaspora($cmd, $contact, $owner, $target_item, $public_message, $top_level, $followup, $walltowall);
+				self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
 				break;
 
 			case NETWORK_OSTATUS:
@@ -209,60 +185,51 @@ class Delivery {
 		return;
 	}
 
-	private static function deliverDFRN($cmd, $contact, $icontacts, $owner, $items, $target_item, $public_message, $top_level, $followup)
+	/**
+	 * @brief Deliver content via DFRN
+	 *
+	 * @param string  $cmd            Command
+	 * @param array   $contact        Contact record of the receiver
+	 * @param array   $owner          Owner record of the sender
+	 * @param array   $items          Item record of the content and the parent
+	 * @param array   $target_item    Item record of the content
+	 * @param boolean $public_message Is the content public?
+	 * @param boolean $top_level      Is it a thread starter?
+	 * @param boolean $followup       Is it an answer to a remote post?
+	 */
+	private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
 	{
-		logger('notifier: '.$target_item["guid"].' dfrndelivery: '.$contact['name']);
+		logger('Deliver ' . $target_item["guid"] . ' via DFRN to ' . $contact['addr']);
 
-		if ($cmd == DELIVER_MAIL) {
+		if ($cmd == self::MAIL) {
 			$item = $target_item;
 			$item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']);
 			$atom = DFRN::mail($item, $owner);
-		} elseif ($cmd == DELIVER_SUGGESTION) {
+		} elseif ($cmd == self::SUGGESTION) {
 			$item = $target_item;
 			$atom = DFRN::fsuggest($item, $owner);
 			dba::delete('fsuggest', ['id' => $item['id']]);
-		} elseif ($cmd == DELIVER_RELOCATION) {
+		} elseif ($cmd == self::RELOCATION) {
 			$atom = DFRN::relocate($owner, $owner['uid']);
 		} elseif ($followup) {
-			$msgitems = [];
-			$msgitems[] = $target_item;
+			$msgitems = [$target_item];
 			$atom = DFRN::entries($msgitems, $owner);
 		} else {
 			$msgitems = [];
 			foreach ($items as $item) {
-				if (!$item['parent']) {
-					return;
-				}
-
-				// private emails may be in included in public conversations. Filter them.
-				if ($public_message && $item['private']) {
-					return;
-				}
-
-				$item_contact = self::getItemContact($item, $icontacts);
-				if (!$item_contact) {
-					return;
-				}
-
-				if (!in_array($cmd, [DELIVER_MAIL, DELIVER_SUGGESTION, DELIVER_RELOCATION])) {
-					// Only add the parent when we don't delete other items.
-					if ($target_item['id'] == $item['id'] || (($item['id'] == $item['parent']) && ($cmd != DELIVER_DELETION))) {
-						$item["entry:comment-allow"] = true;
-						$item["entry:cid"] = ($top_level ? $contact['id'] : 0);
-						$msgitems[] = $item;
-					}
-				} else {
+				// Only add the parent when we don't delete other items.
+				if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) {
 					$item["entry:comment-allow"] = true;
+					$item["entry:cid"] = ($top_level ? $contact['id'] : 0);
 					$msgitems[] = $item;
 				}
 			}
-			$atom = DFRN::entries($msgitems,$owner);
+			$atom = DFRN::entries($msgitems, $owner);
 		}
 
-		logger('notifier entry: '.$contact["url"].' '.$target_item["guid"].' entry: '.$atom, LOGGER_DEBUG);
+		logger('Notifier entry: ' . $contact["url"] . ' ' . $target_item["guid"] . ' entry: ' . $atom, LOGGER_DATA);
 
-		logger('notifier: '.$atom, LOGGER_DATA);
-		$basepath =  implode('/', array_slice(explode('/',$contact['url']),0,3));
+		$basepath =  implode('/', array_slice(explode('/', $contact['url']), 0, 3));
 
 		// perform local delivery if we are on the same site
 
@@ -301,16 +268,26 @@ class Delivery {
 			return;
 		}
 
-		if (!Queue::wasDelayed($contact['id'])) {
-			$deliver_status = DFRN::deliver($owner, $contact, $atom);
+		// We don't have a relationship with contacts on a public post.
+		// Se we transmit with the new method and via Diaspora as a fallback
+		if ($items[0]['uid'] == 0) {
+			// Transmit in public if it's a relay post
+			$public_dfrn = ($contact['contact-type'] == ACCOUNT_TYPE_RELAY);
+
+			$deliver_status = DFRN::transmit($owner, $contact, $atom, $public_dfrn);
+			if (($deliver_status < 200) || ($deliver_status > 299)) {
+				// Transmit via Diaspora if not possible via Friendica
+				self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
+				return;
+			}
 		} else {
-			$deliver_status = -1;
+			$deliver_status = DFRN::deliver($owner, $contact, $atom);
 		}
 
-		logger('notifier: dfrn_delivery to '.$contact["url"].' with guid '.$target_item["guid"].' returns '.$deliver_status);
+		logger('Delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status);
 
 		if ($deliver_status < 0) {
-			logger('notifier: delivery failed: queuing message');
+			logger('Delivery failed: queuing message ' . $target_item["guid"] );
 			Queue::add($contact['id'], NETWORK_DFRN, $atom, false, $target_item['guid']);
 		}
 
@@ -323,25 +300,40 @@ class Delivery {
 		}
 	}
 
-	private static function deliverDiaspora($cmd, $contact, $owner, $target_item, $public_message, $top_level, $followup, $walltowall)
+	/**
+	 * @brief Deliver content via Diaspora
+	 *
+	 * @param string  $cmd            Command
+	 * @param array   $contact        Contact record of the receiver
+	 * @param array   $owner          Owner record of the sender
+	 * @param array   $items          Item record of the content and the parent
+	 * @param array   $target_item    Item record of the content
+	 * @param boolean $public_message Is the content public?
+	 * @param boolean $top_level      Is it a thread starter?
+	 * @param boolean $followup       Is it an answer to a remote post?
+	 */
+	private static function deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
 	{
+		// We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora
+		$walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY);
+
 		if ($public_message) {
 			$loc = 'public batch ' . $contact['batch'];
 		} else {
-			$loc = $contact['name'];
+			$loc = $contact['addr'];
 		}
 
-		logger('delivery: diaspora batch deliver: ' . $loc);
+		logger('Deliver ' . $target_item["guid"] . ' via Diaspora to ' . $loc);
 
 		if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) {
 			return;
 		}
-		if ($cmd == DELIVER_MAIL) {
+		if ($cmd == self::MAIL) {
 			Diaspora::sendMail($target_item, $owner, $contact);
 			return;
 		}
 
-		if ($cmd == DELIVER_SUGGESTION) {
+		if ($cmd == self::SUGGESTION) {
 			return;
 		}
 		if (!$contact['pubkey'] && !$public_message) {
@@ -352,7 +344,7 @@ class Delivery {
 			logger('diaspora retract: ' . $loc);
 			Diaspora::sendRetraction($target_item, $owner, $contact, $public_message);
 			return;
-		} elseif ($cmd == DELIVER_RELOCATION) {
+		} elseif ($cmd == self::RELOCATION) {
 			Diaspora::sendAccountMigration($owner, $contact, $owner['uid']);
 			return;
 		} elseif ($followup) {
@@ -372,9 +364,17 @@ class Delivery {
 			return;
 		}
 
-		logger('Unknown mode ' . $cmd . ' for '.$contact['name']);
+		logger('Unknown mode ' . $cmd . ' for ' . $loc);
 	}
 
+	/**
+	 * @brief Deliver content via mail
+	 *
+	 * @param string $cmd         Command
+	 * @param array  $contact     Contact record of the receiver
+	 * @param array  $owner       Owner record of the sender
+	 * @param array  $target_item Item record of the content
+	 */
 	private static function deliverMail($cmd, $contact, $owner, $target_item)
 	{
 		if (Config::get('system','dfrn_only')) {
@@ -387,7 +387,7 @@ class Delivery {
 			return;
 		}
 
-		if (!in_array($cmd, [DELIVER_POST, DELIVER_COMMENT])) {
+		if (!in_array($cmd, [self::POST, self::COMMENT])) {
 			return;
 		}
 
@@ -396,13 +396,15 @@ class Delivery {
 			return;
 		}
 
+		logger('Deliver ' . $target_item["guid"] . ' via mail to ' . $contact['addr']);
+
 		$reply_to = '';
 		$mailacct = dba::selectFirst('mailacct', ['reply_to'], ['uid' => $owner['uid']]);
 		if (DBM::is_result($mailacct) && !empty($mailacct['reply_to'])) {
 			$reply_to = $mailacct['reply_to'];
 		}
 
-		$subject  = (($target_item['title']) ? Email::encodeHeader($target_item['title'], 'UTF-8') : L10n::t("\x28no subject\x29"));
+		$subject  = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : L10n::t("\x28no subject\x29"));
 
 		// only expose our real email address to true friends
 
@@ -414,7 +416,7 @@ 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@' . $a->get_hostname() . '>' . "\n";
+			$headers  = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . self::getApp()->get_hostname() . '>' . "\n";
 		}
 
 		$headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n";
@@ -441,23 +443,10 @@ class Delivery {
 					}
 				}
 			}
-			if (strncasecmp($subject,  'RE:', 3)) {
+			if (strncasecmp($subject, 'RE:', 3)) {
 				$subject = 'Re: ' . $subject;
 			}
 		}
-		Email::send($addr, $subject, $headers, $it);
-	}
-
-	private static function getItemContact($item, $contacts)
-	{
-		if (!count($contacts) || !is_array($item)) {
-			return false;
-		}
-		foreach ($contacts as $contact) {
-			if ($contact['id'] == $item['contact-id']) {
-				return $contact;
-			}
-		}
-		return false;
+		Email::send($addr, $subject, $headers, $target_item);
 	}
 }
diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php
index de26eab9c1..bd4aa0390b 100644
--- a/src/Worker/PubSubPublish.php
+++ b/src/Worker/PubSubPublish.php
@@ -68,7 +68,7 @@ class PubSubPublish {
 					$rr['topic']),
 				"X-Hub-Signature: sha1=".$hmac_sig];
 
-		logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG);
+		logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DATA);
 
 		Network::post($rr['callback_url'], $params, $headers);
 		$ret = $a->get_curl_code();