diff --git a/src/Module/Feed.php b/src/Module/Feed.php
index ff0abdb2a..0ccffbb96 100644
--- a/src/Module/Feed.php
+++ b/src/Module/Feed.php
@@ -23,7 +23,7 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\DI;
-use Friendica\Protocol\OStatus;
+use Friendica\Protocol\Feed as ProtocolFeed;
 
 /**
  * Provides public Atom feeds
@@ -75,7 +75,7 @@ class Feed extends BaseModule
 		// @TODO: Replace with parameter from router
 		$nickname = $a->argv[1];
 		header("Content-type: application/atom+xml; charset=utf-8");
-		echo OStatus::feed($nickname, $last_update, 10, $type, $nocache, true);
+		echo ProtocolFeed::atom($nickname, $last_update, 10, $type, $nocache, true);
 		exit();
 	}
 }
diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 63bcb9fb9..1899f93be 100644
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -24,15 +24,21 @@ namespace Friendica\Protocol;
 use DOMDocument;
 use DOMXPath;
 use Friendica\Content\PageInfo;
+use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
+use Friendica\Core\Cache\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Tag;
+use Friendica\Model\User;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 /**
@@ -638,4 +644,367 @@ class Feed
 		}
 		return ($title == $body);
 	}
+
+		/**
+	 * Creates the Atom feed for a given nickname
+	 *
+	 * Supported filters:
+	 * - activity (default): all the public posts
+	 * - posts: all the public top-level posts
+	 * - comments: all the public replies
+	 *
+	 * Updates the provided last_update parameter if the result comes from the
+	 * cache or it is empty
+	 *
+	 * @param string  $owner_nick  Nickname of the feed owner
+	 * @param string  $last_update Date of the last update
+	 * @param integer $max_items   Number of maximum items to fetch
+	 * @param string  $filter      Feed items filter (activity, posts or comments)
+	 * @param boolean $nocache     Wether to bypass caching
+	 *
+	 * @return string Atom feed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	public static function atom($owner_nick, $last_update, $max_items = 300, $filter = 'activity', $nocache = false)
+	{
+		$stamp = microtime(true);
+
+		$owner = User::getOwnerDataByNick($owner_nick);
+		if (!$owner) {
+			return;
+		}
+
+		$cachekey = "feed:feed:" . $owner_nick . ":" . $filter . ":" . $last_update;
+
+		$previous_created = $last_update;
+
+		// Don't cache when the last item was posted less then 15 minutes ago (Cache duration)
+		if ((time() - strtotime($owner['last-item'])) < 15*60) {
+			$result = DI::cache()->get($cachekey);
+			if (!$nocache && !is_null($result)) {
+				Logger::info('Cached feed duration', ['seconds' => number_format(microtime(true) - $stamp, 3), 'nick' => $owner_nick, 'filter' => $filter, 'created' => $previous_created]);
+				return $result['feed'];
+			}
+		}
+
+		$check_date = empty($last_update) ? '' : DateTimeFormat::utc($last_update);
+		$authorid = Contact::getIdForURL($owner["url"], 0, false);
+
+		$condition = ["`uid` = ? AND `received` > ? AND NOT `deleted` AND `gravity` IN (?, ?)
+			AND `private` != ? AND `visible` AND `wall` AND `parent-network` IN (?, ?, ?, ?)",
+			$owner["uid"], $check_date, GRAVITY_PARENT, GRAVITY_COMMENT,
+			Item::PRIVATE, Protocol::ACTIVITYPUB,
+			Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA];
+
+		if ($filter === 'comments') {
+			$condition[0] .= " AND `object-type` = ? ";
+			$condition[] = Activity\ObjectType::COMMENT;
+		}
+
+		if ($owner['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
+			$condition[0] .= " AND `contact-id` = ? AND `author-id` = ?";
+			$condition[] = $owner["id"];
+			$condition[] = $authorid;
+		}
+
+		$params = ['order' => ['received' => true], 'limit' => $max_items];
+
+		if ($filter === 'posts') {
+			$ret = Item::selectThread([], $condition, $params);
+		} else {
+			$ret = Item::select([], $condition, $params);
+		}
+
+		$items = Item::inArray($ret);
+
+		$doc = new DOMDocument('1.0', 'utf-8');
+		$doc->formatOutput = true;
+
+		$root = self::addHeader($doc, $owner, $filter);
+
+		foreach ($items as $item) {
+			$entry = self::entry($doc, $item, $owner);
+			$root->appendChild($entry);
+
+			if ($last_update < $item['created']) {
+				$last_update = $item['created'];
+			}
+		}
+
+		$feeddata = trim($doc->saveXML());
+
+		$msg = ['feed' => $feeddata, 'last_update' => $last_update];
+		DI::cache()->set($cachekey, $msg, Duration::QUARTER_HOUR);
+
+		Logger::info('Feed duration', ['seconds' => number_format(microtime(true) - $stamp, 3), 'nick' => $owner_nick, 'filter' => $filter, 'created' => $previous_created]);
+
+		return $feeddata;
+	}
+
+	/**
+	 * Adds the header elements to the XML document
+	 *
+	 * @param DOMDocument $doc       XML document
+	 * @param array       $owner     Contact data of the poster
+	 * @param string      $filter    The related feed filter (activity, posts or comments)
+	 *
+	 * @return object header root element
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	private static function addHeader(DOMDocument $doc, array $owner, $filter)
+	{
+		$root = $doc->createElementNS(ActivityNamespace::ATOM1, 'feed');
+		$doc->appendChild($root);
+
+		$title = '';
+		$selfUri = '/feed/' . $owner["nick"] . '/';
+		switch ($filter) {
+			case 'activity':
+				$title = DI::l10n()->t('%s\'s timeline', $owner['name']);
+				$selfUri .= $filter;
+				break;
+			case 'posts':
+				$title = DI::l10n()->t('%s\'s posts', $owner['name']);
+				break;
+			case 'comments':
+				$title = DI::l10n()->t('%s\'s comments', $owner['name']);
+				$selfUri .= $filter;
+				break;
+		}
+
+		$attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION];
+		XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
+		XML::addElement($doc, $root, "id", DI::baseUrl() . "/profile/" . $owner["nick"]);
+		XML::addElement($doc, $root, "title", $title);
+		XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], DI::config()->get('config', 'sitename')));
+		XML::addElement($doc, $root, "logo", $owner["photo"]);
+		XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
+
+		$author = self::addAuthor($doc, $owner);
+		$root->appendChild($author);
+
+		$attributes = ["href" => $owner["url"], "rel" => "alternate", "type" => "text/html"];
+		XML::addElement($doc, $root, "link", "", $attributes);
+
+		OStatus::hublinks($doc, $root, $owner["nick"]);
+
+		$attributes = ["href" => DI::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"];
+		XML::addElement($doc, $root, "link", "", $attributes);
+
+		return $root;
+	}
+
+	/**
+	 * Adds the author element to the XML document
+	 *
+	 * @param DOMDocument $doc          XML document
+	 * @param array       $owner        Contact data of the poster
+	 *
+	 * @return \DOMElement author element
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	private static function addAuthor(DOMDocument $doc, array $owner)
+	{
+		$author = $doc->createElement("author");
+		XML::addElement($doc, $author, "uri", $owner["url"]);
+		XML::addElement($doc, $author, "name", $owner["nick"]);
+		XML::addElement($doc, $author, "email", $owner["addr"]);
+
+		return $author;
+	}
+
+	/**
+	 * Adds an entry element to the XML document
+	 *
+	 * @param DOMDocument $doc       XML document
+	 * @param array       $item      Data of the item that is to be posted
+	 * @param array       $owner     Contact data of the poster
+	 * @param bool        $toplevel  optional default false
+	 *
+	 * @return \DOMElement Entry element
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	private static function entry(DOMDocument $doc, array $item, array $owner)
+	{
+		$xml = null;
+
+		$repeated_guid = OStatus::getResharedGuid($item);
+		if ($repeated_guid != "") {
+			$xml = self::reshareEntry($doc, $item, $owner, $repeated_guid);
+		}
+
+		if ($xml) {
+			return $xml;
+		}
+
+		return self::noteEntry($doc, $item, $owner);
+	}
+
+		/**
+	 * Adds an entry element with reshared content
+	 *
+	 * @param DOMDocument $doc           XML document
+	 * @param array       $item          Data of the item that is to be posted
+	 * @param array       $owner         Contact data of the poster
+	 * @param string      $repeated_guid guid
+	 * @param bool        $toplevel      Is it for en entry element (false) or a feed entry (true)?
+	 *
+	 * @return bool Entry element
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid)
+	{
+		if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
+			Logger::info('Feed entry author does not match feed owner', ['owner' => $owner["url"], 'author' => $item["author-link"]]);
+		}
+
+		$entry = OStatus::entryHeader($doc, $owner, $item, false);
+
+		$condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => [Item::PUBLIC, Item::UNLISTED],
+			'network' => Protocol::FEDERATED];
+		$repeated_item = Item::selectFirst([], $condition);
+		if (!DBA::isResult($repeated_item)) {
+			return false;
+		}
+
+		$contact = Contact::getByURL($repeated_item['author-link']) ?: $owner;
+
+		$title = $owner["nick"]." repeated a notice by ".$contact["nick"];
+
+		self::entryContent($doc, $entry, $item, $owner, $title, Activity::SHARE, false);
+
+		self::entryFooter($doc, $entry, $item, $owner);
+
+		return $entry;
+	}
+
+	/**
+	 * Adds a regular entry element
+	 *
+	 * @param DOMDocument $doc       XML document
+	 * @param array       $item      Data of the item that is to be posted
+	 * @param array       $owner     Contact data of the poster
+	 * @param bool        $toplevel  Is it for en entry element (false) or a feed entry (true)?
+	 *
+	 * @return \DOMElement Entry element
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	private static function noteEntry(DOMDocument $doc, array $item, array $owner)
+	{
+		if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
+			Logger::info('Feed entry author does not match feed owner', ['owner' => $owner["url"], 'author' => $item["author-link"]]);
+		}
+
+		if (!empty($item['title'])) {
+			$title = BBCode::convert($item['title'], false, BBCode::OSTATUS);
+		} else {
+			$title = sprintf("New note by %s", $owner["nick"]);
+		}
+
+		$entry = OStatus::entryHeader($doc, $owner, $item, false);
+
+		self::entryContent($doc, $entry, $item, $title, '', true);
+
+		self::entryFooter($doc, $entry, $item, $owner);
+
+		return $entry;
+	}
+
+	/**
+	 * Adds elements to the XML document
+	 *
+	 * @param DOMDocument $doc       XML document
+	 * @param \DOMElement $entry     Entry element where the content is added
+	 * @param array       $item      Data of the item that is to be posted
+	 * @param array       $owner     Contact data of the poster
+	 * @param string      $title     Title for the post
+	 * @param string      $verb      The activity verb
+	 * @param bool        $complete  Add the "status_net" element?
+	 * @param bool        $feed_mode Behave like a regular feed for users if true
+	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	private static function entryContent(DOMDocument $doc, \DOMElement $entry, array $item, $title, $verb = "", $complete = true)
+	{
+		if ($verb == "") {
+			$verb = OStatus::constructVerb($item);
+		}
+
+		XML::addElement($doc, $entry, "id", $item["uri"]);
+		XML::addElement($doc, $entry, "title", html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
+
+		$body = OStatus::formatPicturePost($item['body']);
+
+		$body = BBCode::convert($body, false, BBCode::OSTATUS);
+
+		XML::addElement($doc, $entry, "content", $body, ["type" => "html"]);
+
+		XML::addElement($doc, $entry, "link", "", ["rel" => "alternate", "type" => "text/html",
+								"href" => DI::baseUrl()."/display/".$item["guid"]]
+		);
+
+		XML::addElement($doc, $entry, "published", DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM));
+		XML::addElement($doc, $entry, "updated", DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM));
+	}
+
+	/**
+	 * Adds the elements at the foot of an entry to the XML document
+	 *
+	 * @param DOMDocument $doc       XML document
+	 * @param object      $entry     The entry element where the elements are added
+	 * @param array       $item      Data of the item that is to be posted
+	 * @param array       $owner     Contact data of the poster
+	 * @param bool        $complete  default true
+	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner)
+	{
+		$mentioned = [];
+
+		if ($item['gravity'] != GRAVITY_PARENT) {
+			$parent = Item::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item['parent']]);
+			$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
+
+			$thrparent = Item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $parent_item]);
+
+			if (DBA::isResult($thrparent)) {
+				$mentioned[$thrparent["author-link"]] = $thrparent["author-link"];
+				$mentioned[$thrparent["owner-link"]] = $thrparent["owner-link"];
+				$parent_plink = $thrparent["plink"];
+			} else {
+				$mentioned[$parent["author-link"]] = $parent["author-link"];
+				$mentioned[$parent["owner-link"]] = $parent["owner-link"];
+				$parent_plink = DI::baseUrl()."/display/".$parent["guid"];
+			}
+
+			$attributes = [
+					"ref" => $parent_item,
+					"href" => $parent_plink];
+			XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes);
+
+			$attributes = [
+					"rel" => "related",
+					"href" => $parent_plink];
+			XML::addElement($doc, $entry, "link", "", $attributes);
+		}
+
+		// uri-id isn't present for follow entry pseudo-items
+		$tags = Tag::getByURIId($item['uri-id'] ?? 0);
+		foreach ($tags as $tag) {
+			$mentioned[$tag['url']] = $tag['url'];
+		}
+
+		foreach ($tags as $tag) {
+			if ($tag['type'] == Tag::HASHTAG) {
+				XML::addElement($doc, $entry, "category", "", ["term" => $tag['name']]);
+			}
+		}
+
+		OStatus::getAttachment($doc, $entry, $item);
+	}
 }
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 0b95a3a19..d496389c5 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -1208,7 +1208,7 @@ class OStatus
 	 *
 	 * @return string The guid if the post is a reshare
 	 */
-	private static function getResharedGuid(array $item)
+	public static function getResharedGuid(array $item)
 	{
 		$reshared = Item::getShareArray($item);
 		if (empty($reshared['guid']) || !empty($reshared['comment'])) {
@@ -1226,7 +1226,7 @@ class OStatus
 	 * @return string The cleaned body
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function formatPicturePost($body)
+	public static function formatPicturePost($body)
 	{
 		$siteinfo = BBCode::getAttachedData($body);
 
@@ -1262,26 +1262,23 @@ class OStatus
 	 * @param DOMDocument $doc       XML document
 	 * @param array       $owner     Contact data of the poster
 	 * @param string      $filter    The related feed filter (activity, posts or comments)
-	 * @param bool        $feed_mode Behave like a regular feed for users if true
 	 *
 	 * @return object header root element
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function addHeader(DOMDocument $doc, array $owner, $filter, $feed_mode = false)
+	private static function addHeader(DOMDocument $doc, array $owner, $filter)
 	{
 		$root = $doc->createElementNS(ActivityNamespace::ATOM1, 'feed');
 		$doc->appendChild($root);
 
-		if (!$feed_mode) {
-			$root->setAttribute("xmlns:thr", ActivityNamespace::THREAD);
-			$root->setAttribute("xmlns:georss", ActivityNamespace::GEORSS);
-			$root->setAttribute("xmlns:activity", ActivityNamespace::ACTIVITY);
-			$root->setAttribute("xmlns:media", ActivityNamespace::MEDIA);
-			$root->setAttribute("xmlns:poco", ActivityNamespace::POCO);
-			$root->setAttribute("xmlns:ostatus", ActivityNamespace::OSTATUS);
-			$root->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET);
-			$root->setAttribute("xmlns:mastodon", ActivityNamespace::MASTODON);
-		}
+		$root->setAttribute("xmlns:thr", ActivityNamespace::THREAD);
+		$root->setAttribute("xmlns:georss", ActivityNamespace::GEORSS);
+		$root->setAttribute("xmlns:activity", ActivityNamespace::ACTIVITY);
+		$root->setAttribute("xmlns:media", ActivityNamespace::MEDIA);
+		$root->setAttribute("xmlns:poco", ActivityNamespace::POCO);
+		$root->setAttribute("xmlns:ostatus", ActivityNamespace::OSTATUS);
+		$root->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET);
+		$root->setAttribute("xmlns:mastodon", ActivityNamespace::MASTODON);
 
 		$title = '';
 		$selfUri = '/feed/' . $owner["nick"] . '/';
@@ -1299,9 +1296,7 @@ class OStatus
 				break;
 		}
 
-		if (!$feed_mode) {
-			$selfUri = "/dfrn_poll/" . $owner["nick"];
-		}
+		$selfUri = "/dfrn_poll/" . $owner["nick"];
 
 		$attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION];
 		XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
@@ -1311,7 +1306,7 @@ class OStatus
 		XML::addElement($doc, $root, "logo", $owner["photo"]);
 		XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
 
-		$author = self::addAuthor($doc, $owner, true, $feed_mode);
+		$author = self::addAuthor($doc, $owner, true);
 		$root->appendChild($author);
 
 		$attributes = ["href" => $owner["url"], "rel" => "alternate", "type" => "text/html"];
@@ -1325,16 +1320,14 @@ class OStatus
 
 		self::hublinks($doc, $root, $owner["nick"]);
 
-		if (!$feed_mode) {
-			$attributes = ["href" => DI::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "salmon"];
-			XML::addElement($doc, $root, "link", "", $attributes);
+		$attributes = ["href" => DI::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "salmon"];
+		XML::addElement($doc, $root, "link", "", $attributes);
 
-			$attributes = ["href" => DI::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-replies"];
-			XML::addElement($doc, $root, "link", "", $attributes);
+		$attributes = ["href" => DI::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-replies"];
+		XML::addElement($doc, $root, "link", "", $attributes);
 
-			$attributes = ["href" => DI::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention"];
-			XML::addElement($doc, $root, "link", "", $attributes);
-		}
+		$attributes = ["href" => DI::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention"];
+		XML::addElement($doc, $root, "link", "", $attributes);
 
 		$attributes = ["href" => DI::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"];
 		XML::addElement($doc, $root, "link", "", $attributes);
@@ -1373,7 +1366,7 @@ class OStatus
 	 * @return void
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function getAttachment(DOMDocument $doc, $root, $item)
+	public static function getAttachment(DOMDocument $doc, $root, $item)
 	{
 		$siteinfo = BBCode::getAttachedData($item["body"]);
 
@@ -1443,79 +1436,75 @@ class OStatus
 	 * @param DOMDocument $doc          XML document
 	 * @param array       $owner        Contact data of the poster
 	 * @param bool        $show_profile Whether to show profile
-	 * @param bool        $feed_mode Behave like a regular feed for users if true
 	 *
 	 * @return \DOMElement author element
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function addAuthor(DOMDocument $doc, array $owner, $show_profile = true, $feed_mode = false)
+	private static function addAuthor(DOMDocument $doc, array $owner, $show_profile = true)
 	{
 		$profile = DBA::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid']]);
 		$author = $doc->createElement("author");
-		if (!$feed_mode) {
-			XML::addElement($doc, $author, "id", $owner["url"]);
-			if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
-				XML::addElement($doc, $author, "activity:object-type", Activity\ObjectType::GROUP);
-			} else {
-				XML::addElement($doc, $author, "activity:object-type", Activity\ObjectType::PERSON);
-			}
+		XML::addElement($doc, $author, "id", $owner["url"]);
+		if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
+			XML::addElement($doc, $author, "activity:object-type", Activity\ObjectType::GROUP);
+		} else {
+			XML::addElement($doc, $author, "activity:object-type", Activity\ObjectType::PERSON);
 		}
+
 		XML::addElement($doc, $author, "uri", $owner["url"]);
 		XML::addElement($doc, $author, "name", $owner["nick"]);
 		XML::addElement($doc, $author, "email", $owner["addr"]);
-		if ($show_profile && !$feed_mode) {
+		if ($show_profile) {
 			XML::addElement($doc, $author, "summary", BBCode::convert($owner["about"], false, BBCode::OSTATUS));
 		}
 
-		if (!$feed_mode) {
-			$attributes = ["rel" => "alternate", "type" => "text/html", "href" => $owner["url"]];
-			XML::addElement($doc, $author, "link", "", $attributes);
+		$attributes = ["rel" => "alternate", "type" => "text/html", "href" => $owner["url"]];
+		XML::addElement($doc, $author, "link", "", $attributes);
 
+		$attributes = [
+				"rel" => "avatar",
+				"type" => "image/jpeg", // To-Do?
+				"media:width" => 300,
+				"media:height" => 300,
+				"href" => $owner["photo"]];
+		XML::addElement($doc, $author, "link", "", $attributes);
+
+		if (isset($owner["thumb"])) {
 			$attributes = [
 					"rel" => "avatar",
 					"type" => "image/jpeg", // To-Do?
-					"media:width" => 300,
-					"media:height" => 300,
-					"href" => $owner["photo"]];
+					"media:width" => 80,
+					"media:height" => 80,
+					"href" => $owner["thumb"]];
 			XML::addElement($doc, $author, "link", "", $attributes);
+		}
 
-			if (isset($owner["thumb"])) {
-				$attributes = [
-						"rel" => "avatar",
-						"type" => "image/jpeg", // To-Do?
-						"media:width" => 80,
-						"media:height" => 80,
-						"href" => $owner["thumb"]];
-				XML::addElement($doc, $author, "link", "", $attributes);
+		XML::addElement($doc, $author, "poco:preferredUsername", $owner["nick"]);
+		XML::addElement($doc, $author, "poco:displayName", $owner["name"]);
+		if ($show_profile) {
+			XML::addElement($doc, $author, "poco:note", BBCode::convert($owner["about"], false, BBCode::OSTATUS));
+
+			if (trim($owner["location"]) != "") {
+				$element = $doc->createElement("poco:address");
+				XML::addElement($doc, $element, "poco:formatted", $owner["location"]);
+				$author->appendChild($element);
+			}
+		}
+
+		if (DBA::isResult($profile) && !$show_profile) {
+			if (trim($profile["homepage"]) != "") {
+				$urls = $doc->createElement("poco:urls");
+				XML::addElement($doc, $urls, "poco:type", "homepage");
+				XML::addElement($doc, $urls, "poco:value", $profile["homepage"]);
+				XML::addElement($doc, $urls, "poco:primary", "true");
+				$author->appendChild($urls);
 			}
 
-			XML::addElement($doc, $author, "poco:preferredUsername", $owner["nick"]);
-			XML::addElement($doc, $author, "poco:displayName", $owner["name"]);
-			if ($show_profile) {
-				XML::addElement($doc, $author, "poco:note", BBCode::convert($owner["about"], false, BBCode::OSTATUS));
+			XML::addElement($doc, $author, "followers", "", ["url" => DI::baseUrl() . "/profile/" . $owner["nick"] . "/contacts/followers"]);
+			XML::addElement($doc, $author, "statusnet:profile_info", "", ["local_id" => $owner["uid"]]);
 
-				if (trim($owner["location"]) != "") {
-					$element = $doc->createElement("poco:address");
-					XML::addElement($doc, $element, "poco:formatted", $owner["location"]);
-					$author->appendChild($element);
-				}
-			}
-
-			if (DBA::isResult($profile) && !$show_profile) {
-				if (trim($profile["homepage"]) != "") {
-					$urls = $doc->createElement("poco:urls");
-					XML::addElement($doc, $urls, "poco:type", "homepage");
-					XML::addElement($doc, $urls, "poco:value", $profile["homepage"]);
-					XML::addElement($doc, $urls, "poco:primary", "true");
-					$author->appendChild($urls);
-				}
-
-				XML::addElement($doc, $author, "followers", "", ["url" => DI::baseUrl() . "/profile/" . $owner["nick"] . "/contacts/followers"]);
-				XML::addElement($doc, $author, "statusnet:profile_info", "", ["local_id" => $owner["uid"]]);
-
-				if ($profile["publish"]) {
-					XML::addElement($doc, $author, "mastodon:scope", "public");
-				}
+			if ($profile["publish"]) {
+				XML::addElement($doc, $author, "mastodon:scope", "public");
 			}
 		}
 
@@ -1535,7 +1524,7 @@ class OStatus
 	 *
 	 * @return string activity
 	 */
-	private static function constructVerb(array $item)
+	public static function constructVerb(array $item)
 	{
 		if (!empty($item['verb'])) {
 			return $item['verb'];
@@ -1567,19 +1556,18 @@ class OStatus
 	 * @param array       $item      Data of the item that is to be posted
 	 * @param array       $owner     Contact data of the poster
 	 * @param bool        $toplevel  optional default false
-	 * @param bool        $feed_mode Behave like a regular feed for users if true
 	 *
 	 * @return \DOMElement Entry element
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private static function entry(DOMDocument $doc, array $item, array $owner, $toplevel = false, $feed_mode = false)
+	private static function entry(DOMDocument $doc, array $item, array $owner, $toplevel = false)
 	{
 		$xml = null;
 
 		$repeated_guid = self::getResharedGuid($item);
 		if ($repeated_guid != "") {
-			$xml = self::reshareEntry($doc, $item, $owner, $repeated_guid, $toplevel, $feed_mode);
+			$xml = self::reshareEntry($doc, $item, $owner, $repeated_guid, $toplevel);
 		}
 
 		if ($xml) {
@@ -1591,7 +1579,7 @@ class OStatus
 		} elseif (in_array($item["verb"], [Activity::FOLLOW, Activity::O_UNFOLLOW])) {
 			return self::followEntry($doc, $item, $owner, $toplevel);
 		} else {
-			return self::noteEntry($doc, $item, $owner, $toplevel, $feed_mode);
+			return self::noteEntry($doc, $item, $owner, $toplevel);
 		}
 	}
 
@@ -1625,13 +1613,12 @@ class OStatus
 	 * @param array       $owner         Contact data of the poster
 	 * @param string      $repeated_guid guid
 	 * @param bool        $toplevel      Is it for en entry element (false) or a feed entry (true)?
-	 * @param bool        $feed_mode Behave like a regular feed for users if true
 	 *
 	 * @return bool Entry element
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid, $toplevel, $feed_mode = false)
+	private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid, $toplevel)
 	{
 		if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
 			Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
@@ -1650,38 +1637,36 @@ class OStatus
 
 		$title = $owner["nick"]." repeated a notice by ".$contact["nick"];
 
-		self::entryContent($doc, $entry, $item, $owner, $title, Activity::SHARE, false, $feed_mode);
+		self::entryContent($doc, $entry, $item, $owner, $title, Activity::SHARE, false);
 
-		if (!$feed_mode) {
-			$as_object = $doc->createElement("activity:object");
+		$as_object = $doc->createElement("activity:object");
 
-			XML::addElement($doc, $as_object, "activity:object-type", ActivityNamespace::ACTIVITY_SCHEMA . "activity");
+		XML::addElement($doc, $as_object, "activity:object-type", ActivityNamespace::ACTIVITY_SCHEMA . "activity");
 
-			self::entryContent($doc, $as_object, $repeated_item, $owner, "", "", false);
+		self::entryContent($doc, $as_object, $repeated_item, $owner, "", "", false);
 
-			$author = self::addAuthor($doc, $contact, false);
-			$as_object->appendChild($author);
+		$author = self::addAuthor($doc, $contact, false);
+		$as_object->appendChild($author);
 
-			$as_object2 = $doc->createElement("activity:object");
+		$as_object2 = $doc->createElement("activity:object");
 
-			XML::addElement($doc, $as_object2, "activity:object-type", self::constructObjecttype($repeated_item));
+		XML::addElement($doc, $as_object2, "activity:object-type", self::constructObjecttype($repeated_item));
 
-			$title = sprintf("New comment by %s", $contact["nick"]);
+		$title = sprintf("New comment by %s", $contact["nick"]);
 
-			self::entryContent($doc, $as_object2, $repeated_item, $owner, $title);
+		self::entryContent($doc, $as_object2, $repeated_item, $owner, $title);
 
-			$as_object->appendChild($as_object2);
+		$as_object->appendChild($as_object2);
 
-			self::entryFooter($doc, $as_object, $item, $owner, false);
+		self::entryFooter($doc, $as_object, $item, $owner, false);
 
-			$source = self::sourceEntry($doc, $contact);
+		$source = self::sourceEntry($doc, $contact);
 
-			$as_object->appendChild($source);
+		$as_object->appendChild($source);
 
-			$entry->appendChild($as_object);
-		}
+		$entry->appendChild($as_object);
 
-		self::entryFooter($doc, $entry, $item, $owner, true, $feed_mode);
+		self::entryFooter($doc, $entry, $item, $owner, true);
 
 		return $entry;
 	}
@@ -1842,13 +1827,12 @@ class OStatus
 	 * @param array       $item      Data of the item that is to be posted
 	 * @param array       $owner     Contact data of the poster
 	 * @param bool        $toplevel  Is it for en entry element (false) or a feed entry (true)?
-	 * @param bool        $feed_mode Behave like a regular feed for users if true
 	 *
 	 * @return \DOMElement Entry element
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private static function noteEntry(DOMDocument $doc, array $item, array $owner, $toplevel, $feed_mode)
+	private static function noteEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
 	{
 		if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
 			Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
@@ -1866,13 +1850,11 @@ class OStatus
 
 		$entry = self::entryHeader($doc, $owner, $item, $toplevel);
 
-		if (!$feed_mode) {
-			XML::addElement($doc, $entry, "activity:object-type", Activity\ObjectType::NOTE);
-		}
+		XML::addElement($doc, $entry, "activity:object-type", Activity\ObjectType::NOTE);
 
-		self::entryContent($doc, $entry, $item, $owner, $title, '', true, $feed_mode);
+		self::entryContent($doc, $entry, $item, $owner, $title, '', true);
 
-		self::entryFooter($doc, $entry, $item, $owner, !$feed_mode, $feed_mode);
+		self::entryFooter($doc, $entry, $item, $owner, true);
 
 		return $entry;
 	}
@@ -1889,7 +1871,7 @@ class OStatus
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private static function entryHeader(DOMDocument $doc, array $owner, array $item, $toplevel)
+	public static function entryHeader(DOMDocument $doc, array $owner, array $item, $toplevel)
 	{
 		if (!$toplevel) {
 			$entry = $doc->createElement("entry");
@@ -1928,11 +1910,10 @@ class OStatus
 	 * @param string      $title     Title for the post
 	 * @param string      $verb      The activity verb
 	 * @param bool        $complete  Add the "status_net" element?
-	 * @param bool        $feed_mode Behave like a regular feed for users if true
 	 * @return void
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function entryContent(DOMDocument $doc, \DOMElement $entry, array $item, array $owner, $title, $verb = "", $complete = true, $feed_mode = false)
+	private static function entryContent(DOMDocument $doc, \DOMElement $entry, array $item, array $owner, $title, $verb = "", $complete = true)
 	{
 		if ($verb == "") {
 			$verb = self::constructVerb($item);
@@ -1943,7 +1924,7 @@ class OStatus
 
 		$body = self::formatPicturePost($item['body']);
 
-		if (!empty($item['title']) && !$feed_mode) {
+		if (!empty($item['title'])) {
 			$body = "[b]".$item['title']."[/b]\n\n".$body;
 		}
 
@@ -1955,13 +1936,11 @@ class OStatus
 								"href" => DI::baseUrl()."/display/".$item["guid"]]
 		);
 
-		if (!$feed_mode && $complete && ($item["id"] > 0)) {
+		if ($complete && ($item["id"] > 0)) {
 			XML::addElement($doc, $entry, "status_net", "", ["notice_id" => $item["id"]]);
 		}
 
-		if (!$feed_mode) {
-			XML::addElement($doc, $entry, "activity:verb", $verb);
-		}
+		XML::addElement($doc, $entry, "activity:verb", $verb);
 
 		XML::addElement($doc, $entry, "published", DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM));
 		XML::addElement($doc, $entry, "updated", DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM));
@@ -1975,11 +1954,10 @@ class OStatus
 	 * @param array       $item      Data of the item that is to be posted
 	 * @param array       $owner     Contact data of the poster
 	 * @param bool        $complete  default true
-	 * @param bool        $feed_mode Behave like a regular feed for users if true
 	 * @return void
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true, $feed_mode = false)
+	private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true)
 	{
 		$mentioned = [];
 
@@ -2010,7 +1988,7 @@ class OStatus
 			XML::addElement($doc, $entry, "link", "", $attributes);
 		}
 
-		if (!$feed_mode && (intval($item['parent']) > 0)) {
+		if (intval($item['parent']) > 0) {
 			$conversation_href = $conversation_uri = str_replace('/objects/', '/context/', $item['parent-uri']);
 
 			if (isset($parent_item)) {
@@ -2025,16 +2003,14 @@ class OStatus
 				}
 			}
 
-			if (!$feed_mode) {
-				XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:conversation", "href" => $conversation_href]);
+			XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:conversation", "href" => $conversation_href]);
 
-				$attributes = [
-						"href" => $conversation_href,
-						"local_id" => $item['parent'],
-						"ref" => $conversation_uri];
+			$attributes = [
+					"href" => $conversation_href,
+					"local_id" => $item['parent'],
+					"ref" => $conversation_uri];
 
-				XML::addElement($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
-			}
+			XML::addElement($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
 		}
 
 		// uri-id isn't present for follow entry pseudo-items
@@ -2043,50 +2019,48 @@ class OStatus
 			$mentioned[$tag['url']] = $tag['url'];
 		}
 
-		if (!$feed_mode) {
-			// Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS)
-			$newmentions = [];
-			foreach ($mentioned as $mention) {
-				$newmentions[str_replace("http://", "https://", $mention)] = str_replace("http://", "https://", $mention);
-				$newmentions[str_replace("https://", "http://", $mention)] = str_replace("https://", "http://", $mention);
-			}
-			$mentioned = $newmentions;
+		// Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS)
+		$newmentions = [];
+		foreach ($mentioned as $mention) {
+			$newmentions[str_replace("http://", "https://", $mention)] = str_replace("http://", "https://", $mention);
+			$newmentions[str_replace("https://", "http://", $mention)] = str_replace("https://", "http://", $mention);
+		}
+		$mentioned = $newmentions;
 
-			foreach ($mentioned as $mention) {
-				$contact = Contact::getByURL($mention, ['contact-type']);
-				if (!empty($contact) && ($contact['contact-type'] == Contact::TYPE_COMMUNITY)) {
-					XML::addElement($doc, $entry, "link", "",
-						[
-							"rel" => "mentioned",
-							"ostatus:object-type" => Activity\ObjectType::GROUP,
-							"href" => $mention]
-					);
-				} else {
-					XML::addElement($doc, $entry, "link", "",
-						[
-							"rel" => "mentioned",
-							"ostatus:object-type" => Activity\ObjectType::PERSON,
-							"href" => $mention]
-					);
-				}
+		foreach ($mentioned as $mention) {
+			$contact = Contact::getByURL($mention, ['contact-type']);
+			if (!empty($contact) && ($contact['contact-type'] == Contact::TYPE_COMMUNITY)) {
+				XML::addElement($doc, $entry, "link", "",
+					[
+						"rel" => "mentioned",
+						"ostatus:object-type" => Activity\ObjectType::GROUP,
+						"href" => $mention]
+				);
+			} else {
+				XML::addElement($doc, $entry, "link", "",
+					[
+						"rel" => "mentioned",
+						"ostatus:object-type" => Activity\ObjectType::PERSON,
+						"href" => $mention]
+				);
 			}
+		}
 
-			if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
-				XML::addElement($doc, $entry, "link", "", [
-					"rel" => "mentioned",
-					"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
-					"href" => $owner['url']
-				]);
-			}
+		if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
+			XML::addElement($doc, $entry, "link", "", [
+				"rel" => "mentioned",
+				"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
+				"href" => $owner['url']
+			]);
+		}
 
-			if ($item['private'] != Item::PRIVATE) {
-				XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention",
-										"href" => "http://activityschema.org/collection/public"]);
-				XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned",
-										"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/collection",
-										"href" => "http://activityschema.org/collection/public"]);
-				XML::addElement($doc, $entry, "mastodon:scope", "public");
-			}
+		if ($item['private'] != Item::PRIVATE) {
+			XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention",
+									"href" => "http://activityschema.org/collection/public"]);
+			XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned",
+									"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/collection",
+									"href" => "http://activityschema.org/collection/public"]);
+			XML::addElement($doc, $entry, "mastodon:scope", "public");
 		}
 
 		foreach ($tags as $tag) {
@@ -2097,7 +2071,7 @@ class OStatus
 
 		self::getAttachment($doc, $entry, $item);
 
-		if (!$feed_mode && $complete && ($item["id"] > 0)) {
+		if ($complete && ($item["id"] > 0)) {
 			$app = $item["app"];
 			if ($app == "") {
 				$app = "web";
@@ -2133,13 +2107,12 @@ class OStatus
 	 * @param integer $max_items   Number of maximum items to fetch
 	 * @param string  $filter      Feed items filter (activity, posts or comments)
 	 * @param boolean $nocache     Wether to bypass caching
-	 * @param boolean $feed_mode   Behave like a regular feed for users if true
 	 *
 	 * @return string XML feed
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function feed($owner_nick, &$last_update, $max_items = 300, $filter = 'activity', $nocache = false, $feed_mode = false)
+	public static function feed($owner_nick, &$last_update, $max_items = 300, $filter = 'activity', $nocache = false)
 	{
 		$stamp = microtime(true);
 
@@ -2166,7 +2139,7 @@ class OStatus
 			$last_update = 'now -30 days';
 		}
 
-		$check_date = $feed_mode ? '' : DateTimeFormat::utc($last_update);
+		$check_date = DateTimeFormat::utc($last_update);
 		$authorid = Contact::getIdForURL($owner["url"], 0, false);
 
 		$condition = ["`uid` = ? AND `received` > ? AND NOT `deleted`
@@ -2197,7 +2170,7 @@ class OStatus
 		$doc = new DOMDocument('1.0', 'utf-8');
 		$doc->formatOutput = true;
 
-		$root = self::addHeader($doc, $owner, $filter, $feed_mode);
+		$root = self::addHeader($doc, $owner, $filter);
 
 		foreach ($items as $item) {
 			if (DI::config()->get('system', 'ostatus_debug')) {
@@ -2208,7 +2181,7 @@ class OStatus
 				continue;
 			}
 
-			$entry = self::entry($doc, $item, $owner, false, $feed_mode);
+			$entry = self::entry($doc, $item, $owner, false);
 			$root->appendChild($entry);
 
 			if ($last_update < $item['created']) {