diff --git a/src/Content/Item.php b/src/Content/Item.php
index 41879b75b9..28d980473a 100644
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -1032,7 +1032,7 @@ class Item
 			}
 
 			$this->emailer->send(new ItemCCEMail(
-				$this->app,
+				$this->userSession,
 				$this->l10n,
 				$this->baseURL,
 				$post,
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index d42483a4e0..2dd7c05d70 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -873,6 +873,9 @@ class Processor
 			} elseif ($uri_id = ItemURI::getIdByURI($activity['quote-url'], false)) {
 				Logger::info('Quote was not fetched but the uri-id existed', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'uri-id' => $uri_id]);
 				$item['quote-uri-id'] = $uri_id;
+			} elseif (Queue::exists($activity['quote-url'], 'as:Create')) {
+				Logger::info('Quote is queued but not processed yet', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'uri-id' => $uri_id]);
+				$item['quote-uri-id'] = ItemURI::getIdByURI($activity['quote-url']);
 			} else {
 				Logger::info('Quote was not fetched', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url']]);
 			}