diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 2d0140c171..e0108ddcfe 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -58,7 +58,7 @@ class Notifier
 	{
 		$a = BaseObject::getApp();
 
-		Logger::log('notifier: invoked: '.$cmd.': '.$item_id, Logger::DEBUG);
+		Logger::log('Invoked: ' . $cmd . ': ' . $item_id, Logger::DEBUG);
 
 		$top_level = false;
 		$recipients = [];
@@ -148,7 +148,7 @@ class Notifier
 			}
 
 			if ((count($items) == 1) && ($items[0]['id'] === $target_item['id']) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
-				Logger::log('notifier: top level post');
+				Logger::log('Top level post');
 				$top_level = true;
 			}
 		}
@@ -174,7 +174,6 @@ class Notifier
 
 		$followup = false;
 		$recipients_followup = [];
-		$conversants = [];
 
 		if (!in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION, Delivery::RELOCATION])) {
 			$parent = $items[0];
@@ -185,7 +184,7 @@ class Notifier
 			$condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]];
 			$thr_parent = Item::selectFirst($fields, $condition);
 
-			Logger::log('GUID: '.$target_item["guid"].': Parent is '.$parent['network'].'. Thread parent is '.$thr_parent['network'], Logger::DEBUG);
+			Logger::log('GUID: ' . $target_item["guid"] . ': Parent is ' . $parent['network'] . '. Thread parent is ' . $thr_parent['network'], Logger::DEBUG);
 
 			// This is IMPORTANT!!!!
 
@@ -245,11 +244,10 @@ class Notifier
 				// local followup to remote post
 				$followup = true;
 				$public_message = false; // not public
-				$conversant_str = DBA::escape($parent['contact-id']);
 				$recipients = [$parent['contact-id']];
 				$recipients_followup  = [$parent['contact-id']];
 
-				Logger::log('notifier: followup '.$target_item["guid"].' to '.$conversant_str, Logger::DEBUG);
+				Logger::log('Followup ' . $target_item['guid'] . ' to ' . $parent['contact-id'], Logger::DEBUG);
 
 				//if (!$target_item['private'] && $target_item['wall'] &&
 				if (!$target_item['private'] &&
@@ -279,16 +277,16 @@ class Notifier
 					$push_notify = false;
 				}
 
-				Logger::log("Notify ".$target_item["guid"]." via PuSH: ".($push_notify?"Yes":"No"), Logger::DEBUG);
+				Logger::log('Notify ' . $target_item["guid"] .' via PuSH: ' . ($push_notify ? "Yes":"No"), Logger::DEBUG);
 			} else {
 				$followup = false;
 
-				Logger::log('Distributing directly '.$target_item["guid"], Logger::DEBUG);
+				Logger::log('Distributing directly ' . $target_item["guid"], Logger::DEBUG);
 
 				// don't send deletions onward for other people's stuff
 
 				if ($target_item['deleted'] && !intval($target_item['wall'])) {
-					Logger::log('notifier: ignoring delete notification for non-wall item');
+					Logger::log('Ignoring delete notification for non-wall item');
 					return;
 				}
 
@@ -313,14 +311,12 @@ class Notifier
 
 				foreach ($items as $item) {
 					$recipients[] = $item['contact-id'];
-					$conversants[] = $item['contact-id'];
 					// pull out additional tagged people to notify (if public message)
 					if ($public_message && strlen($item['inform'])) {
 						$people = explode(',',$item['inform']);
 						foreach ($people as $person) {
 							if (substr($person,0,4) === 'cid:') {
 								$recipients[] = intval(substr($person,4));
-								$conversants[] = intval(substr($person,4));
 							} else {
 								$url_recipients[] = substr($person,4);
 							}
@@ -329,16 +325,12 @@ class Notifier
 				}
 
 				if (count($url_recipients)) {
-					Logger::log('notifier: '.$target_item["guid"].' url_recipients ' . print_r($url_recipients,true));
+					Logger::log('Deliver ' . $target_item["guid"] . ' to _recipients ' . json_decode($url_recipients));
 				}
 
-				$conversants = array_unique($conversants);
-
-				$recipients = array_unique(array_merge($recipients,$allow_people,$allow_groups));
-				$deny = array_unique(array_merge($deny_people,$deny_groups));
-				$recipients = array_diff($recipients,$deny);
-
-				$conversant_str = DBA::escape(implode(', ',$conversants));
+				$recipients = array_unique(array_merge($recipients, $allow_people, $allow_groups));
+				$deny = array_unique(array_merge($deny_people, $deny_groups));
+				$recipients = array_diff($recipients, $deny);
 			}
 
 			// If the thread parent is OStatus then do some magic to distribute the messages.
@@ -403,7 +395,7 @@ class Notifier
 		}
 
 		if (($cmd == Delivery::RELOCATION)) {
-			$r = $recipients_relocate;
+			$contacts = $recipients_relocate;
 		} else {
 			if ($followup) {
 				$recipients = $recipients_followup;
@@ -413,37 +405,19 @@ class Notifier
 			if (!empty($networks)) {
 				$condition['network'] = $networks;
 			}
-			$contacts = DBA::select('contact', ['id', 'url', 'network'], $condition);
-			$r = DBA::toArray($contacts);
+			$result = DBA::select('contact', ['id', 'url', 'network', 'batch'], $condition);
+			$contacts = DBA::toArray($result);
 		}
 
-		// delivery loop
-		if (DBA::isResult($r)) {
-			foreach ($r as $contact) {
-				Logger::log("Deliver ".$item_id." to ".$contact['url']." via network ".$contact['network'], Logger::DEBUG);
+		$conversants = [];
+		$batch_delivery = false;
 
-				Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
-						'Delivery', $cmd, $item_id, (int)$contact['id']);
-			}
-		}
-
-		// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
-		// They are especially used for notifications to OStatus users that don't follow us.
-		if (!Config::get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
-			$slap = OStatus::salmon($target_item, $owner);
-			foreach ($url_recipients as $url) {
-				if ($url) {
-					Logger::log('notifier: urldelivery: ' . $url);
-					$deliver_status = Salmon::slapper($owner, $url, $slap);
-					/// @TODO Redeliver/queue these items on failure, though there is no contact record
-				}
-			}
-		}
-
-		if ($public_message) {
+		if ($public_message && !in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION]) && !$followup) {
 			$r1 = [];
 
 			if ($diaspora_delivery) {
+				$batch_delivery = true;
+
 				$r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network`
 					FROM `contact` WHERE `network` = '%s' AND `batch` != ''
 					AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch`",
@@ -470,28 +444,51 @@ class Notifier
 			$r = array_merge($r2, $r1);
 
 			if (DBA::isResult($r)) {
-				Logger::log('pubdeliver '.$target_item["guid"].': '.print_r($r,true), Logger::DEBUG);
-
 				foreach ($r as $rr) {
-					// except for Diaspora batch jobs
-					// Don't deliver to folks who have already been delivered to
-
-					if (($rr['network'] !== Protocol::DIASPORA) && (in_array($rr['id'], $conversants))) {
-						Logger::log('notifier: already delivered id=' . $rr['id']);
-						continue;
-					}
-
-					if (!in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION]) && !$followup) {
-						Logger::log('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
-						Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
-								'Delivery', $cmd, $item_id, (int)$rr['id']);
-					}
+					$conversants[] = $rr['id'];
+					Logger::log('Public delivery of item ' . $target_item["guid"] . ' (' . $item_id . ') to ' . json_encode($rr), Logger::DEBUG);
+					Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
+						'Delivery', $cmd, $item_id, (int)$rr['id']);
 				}
 			}
 
 			$push_notify = true;
 		}
 
+		// delivery loop
+		if (DBA::isResult($contacts)) {
+			foreach ($contacts as $contact) {
+				// Don't deliver to Diaspora if it already had been done as batch delivery
+				if (($contact['network'] == Protocol::DIASPORA) && $batch_delivery) {
+					Logger::log('Already delivered  id ' . $item_id . ' via batch to ' . json_encode($contact), Logger::DEBUG);
+					continue;
+				}
+
+				// Don't deliver to folks who have already been delivered to
+				if (in_array($contact['id'], $conversants)) {
+					Logger::log('Already delivered id ' . $item_id. ' to ' . json_encode($contact), Logger::DEBUG);
+					continue;
+				}
+
+				Logger::log('Delivery of item ' . $item_id . ' to ' . json_encode($contact), Logger::DEBUG);
+				Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
+						'Delivery', $cmd, $item_id, (int)$contact['id']);
+			}
+		}
+
+		// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
+		// They are especially used for notifications to OStatus users that don't follow us.
+		if (!Config::get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
+			$slap = OStatus::salmon($target_item, $owner);
+			foreach ($url_recipients as $url) {
+				if ($url) {
+					Logger::log('Salmon delivery of item ' . $item_id . ' to ' . $url);
+					$deliver_status = Salmon::slapper($owner, $url, $slap);
+					/// @TODO Redeliver/queue these items on failure, though there is no contact record
+				}
+			}
+		}
+
 		// Notify PuSH subscribers (Used for OStatus distribution of regular posts)
 		if ($push_notify) {
 			Logger::log('Activating internal PuSH for item '.$item_id, Logger::DEBUG);
@@ -500,7 +497,7 @@ class Notifier
 			PushSubscriber::publishFeed($owner['uid'], $a->queue['priority']);
 		}
 
-		Logger::log('notifier: calling hooks for ' . $cmd . ' ' . $item_id, Logger::DEBUG);
+		Logger::log('Calling hooks for ' . $cmd . ' ' . $item_id, Logger::DEBUG);
 
 		if ($normal_mode) {
 			Hook::fork($a->queue['priority'], 'notifier_normal', $target_item);