diff --git a/include/api.php b/include/api.php
index 91e31ac94..24a0585ee 100644
--- a/include/api.php
+++ b/include/api.php
@@ -7,6 +7,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseObject;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
@@ -15,7 +16,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\NotificationsManager;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Session;
@@ -26,6 +26,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Mail;
+use Friendica\Model\Notify;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
@@ -1375,7 +1376,7 @@ function api_get_item(array $condition)
  */
 function api_users_show($type)
 {
-	$a = \Friendica\BaseObject::getApp();
+	$a = BaseObject::getApp();
 
 	$user_info = api_get_user($a);
 
@@ -2948,7 +2949,7 @@ function api_format_items_profiles($profile_row)
  */
 function api_format_items($items, $user_info, $filter_user = false, $type = "json")
 {
-	$a = \Friendica\BaseObject::getApp();
+	$a = BaseObject::getApp();
 
 	$ret = [];
 
@@ -2982,7 +2983,7 @@ function api_format_items($items, $user_info, $filter_user = false, $type = "jso
  */
 function api_format_item($item, $type = "json", $status_user = null, $author_user = null, $owner_user = null)
 {
-	$a = \Friendica\BaseObject::getApp();
+	$a = BaseObject::getApp();
 
 	if (empty($status_user) || empty($author_user) || empty($owner_user)) {
 		list($status_user, $author_user, $owner_user) = api_item_get_user($a, $item);
@@ -6040,7 +6041,8 @@ function api_friendica_notification($type)
 	if ($a->argc!==3) {
 		throw new BadRequestException("Invalid argument count");
 	}
-	$nm = new NotificationsManager();
+	/** @var Notify $nm */
+	$nm = BaseObject::getClass(Notify::class);
 
 	$notes = $nm->getAll([], ['seen' => 'ASC', 'date' => 'DESC'], 50);
 
@@ -6084,7 +6086,8 @@ function api_friendica_notification_seen($type)
 
 	$id = (!empty($_REQUEST['id']) ? intval($_REQUEST['id']) : 0);
 
-	$nm = new NotificationsManager();
+	/** @var Notify $nm */
+	$nm = BaseObject::getClass(Notify::class);
 	$note = $nm->getByID($id);
 	if (is_null($note)) {
 		throw new BadRequestException("Invalid argument");
diff --git a/mod/notifications.php b/mod/notifications.php
index 8fbc5dac4..88972728c 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -9,14 +9,13 @@ use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Core\L10n;
-use Friendica\Core\NotificationsManager;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Module\Login;
 use Friendica\Model\Contact;
+use Friendica\Model\Notify;
 
 function notifications_post(App $a)
 {
@@ -79,13 +78,14 @@ function notifications_content(App $a)
 	}
 
 	$page = ($_REQUEST['page'] ?? 0) ?: 1;
-	$show =  $_REQUEST['show'] ?? 0;
+	$show = ($_REQUEST['show'] ?? '') === 'all';
 
 	Nav::setSelected('notifications');
 
 	$json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false);
 
-	$nm = new NotificationsManager();
+	/** @var Notify $nm */
+	$nm = \Friendica\BaseObject::getClass(Notify::class);
 
 	$o = '';
 	// Get the nav tabs for the notification pages
@@ -112,27 +112,27 @@ function notifications_content(App $a)
 
 		$all = (($a->argc > 2) && ($a->argv[2] == 'all'));
 
-		$notifs = $nm->introNotifs($all, $startrec, $perpage, $id);
+		$notifs = $nm->getIntroList($all, $startrec, $perpage, $id);
 
 	// Get the network notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'network')) {
 		$notif_header = L10n::t('Network Notifications');
-		$notifs = $nm->networkNotifs($show, $startrec, $perpage);
+		$notifs = $nm->getNetworkList($show, $startrec, $perpage);
 
 	// Get the system notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'system')) {
 		$notif_header = L10n::t('System Notifications');
-		$notifs = $nm->systemNotifs($show, $startrec, $perpage);
+		$notifs = $nm->getSystemList($show, $startrec, $perpage);
 
 	// Get the personal notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'personal')) {
 		$notif_header = L10n::t('Personal Notifications');
-		$notifs = $nm->personalNotifs($show, $startrec, $perpage);
+		$notifs = $nm->getPersonalList($show, $startrec, $perpage);
 
 	// Get the home notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
 		$notif_header = L10n::t('Home Notifications');
-		$notifs = $nm->homeNotifs($show, $startrec, $perpage);
+		$notifs = $nm->getHomeList($show, $startrec, $perpage);
 	// fallback - redirect to main page
 	} else {
 		$a->internalRedirect('notifications');
diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
deleted file mode 100644
index cf2dd9e36..000000000
--- a/src/Core/NotificationsManager.php
+++ /dev/null
@@ -1,727 +0,0 @@
-<?php
-/**
- * @file src/Core/NotificationsManager.php
- * @brief Methods for read and write notifications from/to database
- *  or for formatting notifications
- */
-namespace Friendica\Core;
-
-use Friendica\BaseObject;
-use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\HTML;
-use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Model\Item;
-use Friendica\Protocol\Activity;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Util\Temporal;
-use Friendica\Util\XML;
-
-/**
- * @brief Methods for read and write notifications from/to database
- *  or for formatting notifications
- */
-class NotificationsManager extends BaseObject
-{
-	/**
-	 * @brief set some extra note properties
-	 *
-	 * @param array $notes array of note arrays from db
-	 * @return array Copy of input array with added properties
-	 *
-	 * Set some extra properties to note array from db:
-	 *  - timestamp as int in default TZ
-	 *  - date_rel : relative date string
-	 *  - msg_html: message as html string
-	 *  - msg_plain: message as plain text string
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	private function _set_extra(array $notes)
-	{
-		$rets = [];
-		foreach ($notes as $n) {
-			$local_time = DateTimeFormat::local($n['date']);
-			$n['timestamp'] = strtotime($local_time);
-			$n['date_rel'] = Temporal::getRelativeDate($n['date']);
-			$n['msg_html'] = BBCode::convert($n['msg'], false);
-			$n['msg_plain'] = explode("\n", trim(HTML::toPlaintext($n['msg_html'], 0)))[0];
-
-			$rets[] = $n;
-		}
-		return $rets;
-	}
-
-	/**
-	 * @brief Get all notifications for local_user()
-	 *
-	 * @param array  $filter optional Array "column name"=>value: filter query by columns values
-	 * @param array  $order  optional Array to order by
-	 * @param string $limit  optional Query limits
-	 *
-	 * @return array|bool of results or false on errors
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	public function getAll($filter = [], $order = ['date' => 'DESC'], $limit = "")
-	{
-		$params = [];
-
-		$params['order'] = $order;
-
-		if (!empty($limit)) {
-			$params['limit'] = $limit;
-		}
-
-		$dbFilter = array_merge($filter, ['uid' => local_user()]);
-
-		$stmtNotifies = DBA::select('notify', [], $dbFilter, $params);
-
-		if (DBA::isResult($stmtNotifies)) {
-			return $this->_set_extra(DBA::toArray($stmtNotifies));
-		}
-
-		return false;
-	}
-
-	/**
-	 * @brief Get one note for local_user() by $id value
-	 *
-	 * @param int $id identity
-	 * @return array note values or null if not found
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	public function getByID($id)
-	{
-		$stmtNotify = DBA::selectFirst('notify', [], ['id' => $id, 'uid' => local_user()]);
-		if (DBA::isResult($stmtNotify)) {
-			return $this->_set_extra([$stmtNotify])[0];
-		}
-		return null;
-	}
-
-	/**
-	 * @brief set seen state of $note of local_user()
-	 *
-	 * @param array $note note array
-	 * @param bool  $seen optional true or false, default true
-	 * @return bool true on success, false on errors
-	 * @throws \Exception
-	 */
-	public function setSeen($note, $seen = true)
-	{
-		return DBA::update('notify', ['seen' => $seen], [
-			'(`link` = ? OR (`parent` != 0 AND `parent` = ? AND `otype` = ?)) AND `uid` = ?',
-			$note['link'],
-			$note['parent'],
-			$note['otype'],
-			local_user()
-		]);
-	}
-
-	/**
-	 * @brief set seen state of all notifications of local_user()
-	 *
-	 * @param bool $seen optional true or false. default true
-	 * @return bool true on success, false on error
-	 * @throws \Exception
-	 */
-	public function setAllSeen($seen = true)
-	{
-		return DBA::update('notify', ['seen' => $seen], ['uid' => local_user()]);
-	}
-
-	/**
-	 * @brief List of pages for the Notifications TabBar
-	 *
-	 * @return array with with notifications TabBar data
-	 * @throws \Exception
-	 */
-	public function getTabs()
-	{
-		$selected = self::getApp()->argv[1] ?? '';
-
-		$tabs = [
-			[
-				'label' => L10n::t('System'),
-				'url'   => 'notifications/system',
-				'sel'   => (($selected == 'system') ? 'active' : ''),
-				'id'    => 'system-tab',
-				'accesskey' => 'y',
-			],
-			[
-				'label' => L10n::t('Network'),
-				'url'   => 'notifications/network',
-				'sel'   => (($selected == 'network') ? 'active' : ''),
-				'id'    => 'network-tab',
-				'accesskey' => 'w',
-			],
-			[
-				'label' => L10n::t('Personal'),
-				'url'   => 'notifications/personal',
-				'sel'   => (($selected == 'personal') ? 'active' : ''),
-				'id'    => 'personal-tab',
-				'accesskey' => 'r',
-			],
-			[
-				'label' => L10n::t('Home'),
-				'url'   => 'notifications/home',
-				'sel'   => (($selected == 'home') ? 'active' : ''),
-				'id'    => 'home-tab',
-				'accesskey' => 'h',
-			],
-			[
-				'label' => L10n::t('Introductions'),
-				'url'   => 'notifications/intros',
-				'sel'   => (($selected == 'intros') ? 'active' : ''),
-				'id'    => 'intro-tab',
-				'accesskey' => 'i',
-			],
-		];
-
-		return $tabs;
-	}
-
-	/**
-	 * @brief Format the notification query in an usable array
-	 *
-	 * @param array  $notifs The array from the db query
-	 * @param string $ident  The notifications identifier (e.g. network)
-	 * @return array
-	 *                       string 'label' => The type of the notification
-	 *                       string 'link' => URL to the source
-	 *                       string 'image' => The avatar image
-	 *                       string 'url' => The profile url of the contact
-	 *                       string 'text' => The notification text
-	 *                       string 'when' => The date of the notification
-	 *                       string 'ago' => T relative date of the notification
-	 *                       bool 'seen' => Is the notification marked as "seen"
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	private function formatNotifs(array $notifs, $ident = "")
-	{
-		$arr = [];
-
-		if (DBA::isResult($notifs)) {
-			foreach ($notifs as $it) {
-				// Because we use different db tables for the notification query
-				// we have sometimes $it['unseen'] and sometimes $it['seen].
-				// So we will have to transform $it['unseen']
-				if (array_key_exists('unseen', $it)) {
-					$it['seen'] = ($it['unseen'] > 0 ? false : true);
-				}
-
-				// For feed items we use the user's contact, since the avatar is mostly self choosen.
-				if (!empty($it['network']) && $it['network'] == Protocol::FEED) {
-					$it['author-avatar'] = $it['contact-avatar'];
-				}
-
-				// Depending on the identifier of the notification we need to use different defaults
-				switch ($ident) {
-					case 'system':
-						$default_item_label = 'notify';
-						$default_item_link = System::baseUrl(true) . '/notify/view/' . $it['id'];
-						$default_item_image = ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_MICRO);
-						$default_item_url = $it['url'];
-						$default_item_text = strip_tags(BBCode::convert($it['msg']));
-						$default_item_when = DateTimeFormat::local($it['date'], 'r');
-						$default_item_ago = Temporal::getRelativeDate($it['date']);
-						break;
-
-					case 'home':
-						$default_item_label = 'comment';
-						$default_item_link = System::baseUrl(true) . '/display/' . $it['parent-guid'];
-						$default_item_image = ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO);
-						$default_item_url = $it['author-link'];
-						$default_item_text = L10n::t("%s commented on %s's post", $it['author-name'], $it['parent-author-name']);
-						$default_item_when = DateTimeFormat::local($it['created'], 'r');
-						$default_item_ago = Temporal::getRelativeDate($it['created']);
-						break;
-
-					default:
-						$default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment');
-						$default_item_link = System::baseUrl(true) . '/display/' . $it['parent-guid'];
-						$default_item_image = ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO);
-						$default_item_url = $it['author-link'];
-						$default_item_text = (($it['id'] == $it['parent'])
-									? L10n::t("%s created a new post", $it['author-name'])
-									: L10n::t("%s commented on %s's post", $it['author-name'], $it['parent-author-name']));
-						$default_item_when = DateTimeFormat::local($it['created'], 'r');
-						$default_item_ago = Temporal::getRelativeDate($it['created']);
-				}
-
-				// Transform the different types of notification in an usable array
-				switch ($it['verb']) {
-					case Activity::LIKE:
-						$notif = [
-							'label' => 'like',
-							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
-							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
-							'url' => $it['author-link'],
-							'text' => L10n::t("%s liked %s's post", $it['author-name'], $it['parent-author-name']),
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						];
-						break;
-
-					case Activity::DISLIKE:
-						$notif = [
-							'label' => 'dislike',
-							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
-							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
-							'url' => $it['author-link'],
-							'text' => L10n::t("%s disliked %s's post", $it['author-name'], $it['parent-author-name']),
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						];
-						break;
-
-					case Activity::ATTEND:
-						$notif = [
-							'label' => 'attend',
-							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
-							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
-							'url' => $it['author-link'],
-							'text' => L10n::t("%s is attending %s's event", $it['author-name'], $it['parent-author-name']),
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						];
-						break;
-
-					case Activity::ATTENDNO:
-						$notif = [
-							'label' => 'attendno',
-							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
-							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
-							'url' => $it['author-link'],
-							'text' => L10n::t("%s is not attending %s's event", $it['author-name'], $it['parent-author-name']),
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						];
-						break;
-
-					case Activity::ATTENDMAYBE:
-						$notif = [
-							'label' => 'attendmaybe',
-							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
-							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
-							'url' => $it['author-link'],
-							'text' => L10n::t("%s may attend %s's event", $it['author-name'], $it['parent-author-name']),
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						];
-						break;
-
-					case Activity::FRIEND:
-						if (!isset($it['object'])) {
-							$notif = [
-								'label' => 'friend',
-								'link' => $default_item_link,
-								'image' => $default_item_image,
-								'url' => $default_item_url,
-								'text' => $default_item_text,
-								'when' => $default_item_when,
-								'ago' => $default_item_ago,
-								'seen' => $it['seen']
-							];
-							break;
-						}
-						/// @todo Check if this part here is used at all
-						Logger::log('Complete data: ' . json_encode($it) . ' - ' . System::callstack(20), Logger::DEBUG);
-
-						$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
-						$obj = XML::parseString($xmlhead . $it['object']);
-						$it['fname'] = $obj->title;
-
-						$notif = [
-							'label' => 'friend',
-							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
-							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
-							'url' => $it['author-link'],
-							'text' => L10n::t("%s is now friends with %s", $it['author-name'], $it['fname']),
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						];
-						break;
-
-					default:
-						$notif = [
-							'label' => $default_item_label,
-							'link' => $default_item_link,
-							'image' => $default_item_image,
-							'url' => $default_item_url,
-							'text' => $default_item_text,
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						];
-				}
-
-				$arr[] = $notif;
-			}
-		}
-
-		return $arr;
-	}
-
-	/**
-	 * @brief Get network notifications
-	 *
-	 * @param int|string $seen    If 0 only include notifications into the query
-	 *                            which aren't marked as "seen"
-	 * @param int        $start   Start the query at this point
-	 * @param int        $limit   Maximum number of query results
-	 *
-	 * @return array with
-	 *    string 'ident' => Notification identifier
-	 *    array 'notifications' => Network notifications
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	public function networkNotifs($seen = 0, $start = 0, $limit = 80)
-	{
-		$ident = 'network';
-		$notifs = [];
-
-		$condition = ['wall' => false, 'uid' => local_user()];
-
-		if ($seen === 0) {
-			$condition['unseen'] = true;
-		}
-
-		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
-			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
-		$params = ['order' => ['received' => true], 'limit' => [$start, $limit]];
-
-		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
-
-		if (DBA::isResult($items)) {
-			$notifs = $this->formatNotifs(Item::inArray($items), $ident);
-		}
-
-		$arr = [
-			'notifications' => $notifs,
-			'ident' => $ident,
-		];
-
-		return $arr;
-	}
-
-	/**
-	 * @brief Get system notifications
-	 *
-	 * @param int|string $seen    If 0 only include notifications into the query
-	 *                            which aren't marked as "seen"
-	 * @param int        $start   Start the query at this point
-	 * @param int        $limit   Maximum number of query results
-	 *
-	 * @return array with
-	 *    string 'ident' => Notification identifier
-	 *    array 'notifications' => System notifications
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	public function systemNotifs($seen = 0, $start = 0, $limit = 80)
-	{
-		$ident = 'system';
-		$notifs = [];
-		$sql_seen = "";
-
-		$filter = ['uid' => local_user()];
-		if ($seen === 0) {
-			$filter['seen'] = false;
-		}
-
-		$params = [];
-		$params['order'] = ['date' => 'DESC'];
-		$params['limit'] = [$start, $limit];
-
-		$stmtNotifies = DBA::select('notify',
-			['id', 'url', 'photo', 'msg', 'date', 'seen', 'verb'],
-			$filter,
-			$params);
-
-		if (DBA::isResult($stmtNotifies)) {
-			$notifs = $this->formatNotifs(DBA::toArray($stmtNotifies), $ident);
-		}
-
-		$arr = [
-			'notifications' => $notifs,
-			'ident' => $ident,
-		];
-
-		return $arr;
-	}
-
-	/**
-	 * @brief Get personal notifications
-	 *
-	 * @param int|string $seen    If 0 only include notifications into the query
-	 *                            which aren't marked as "seen"
-	 * @param int        $start   Start the query at this point
-	 * @param int        $limit   Maximum number of query results
-	 *
-	 * @return array with
-	 *    string 'ident' => Notification identifier
-	 *    array 'notifications' => Personal notifications
-	 * @throws \Exception
-	 */
-	public function personalNotifs($seen = 0, $start = 0, $limit = 80)
-	{
-		$ident = 'personal';
-		$notifs = [];
-
-		$myurl = str_replace('http://', '', self::getApp()->contact['nurl']);
-		$diasp_url = str_replace('/profile/', '/u/', $myurl);
-
-		$condition = ["NOT `wall` AND `uid` = ? AND (`item`.`author-id` = ? OR `item`.`tag` REGEXP ? OR `item`.`tag` REGEXP ?)",
-			local_user(), public_contact(), $myurl . '\\]', $diasp_url . '\\]'];
-
-		if ($seen === 0) {
-			$condition[0] .= " AND `unseen`";
-		}
-
-		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
-			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
-		$params = ['order' => ['received' => true], 'limit' => [$start, $limit]];
-
-		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
-
-		if (DBA::isResult($items)) {
-			$notifs = $this->formatNotifs(Item::inArray($items), $ident);
-		}
-
-		$arr = [
-			'notifications' => $notifs,
-			'ident' => $ident,
-		];
-
-		return $arr;
-	}
-
-	/**
-	 * @brief Get home notifications
-	 *
-	 * @param int|string $seen    If 0 only include notifications into the query
-	 *                            which aren't marked as "seen"
-	 * @param int        $start   Start the query at this point
-	 * @param int        $limit   Maximum number of query results
-	 *
-	 * @return array with
-	 *    string 'ident' => Notification identifier
-	 *    array 'notifications' => Home notifications
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	public function homeNotifs($seen = 0, $start = 0, $limit = 80)
-	{
-		$ident = 'home';
-		$notifs = [];
-
-		$condition = ['wall' => true, 'uid' => local_user()];
-
-		if ($seen === 0) {
-			$condition['unseen'] = true;
-		}
-
-		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
-			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
-		$params = ['order' => ['received' => true], 'limit' => [$start, $limit]];
-		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
-
-		if (DBA::isResult($items)) {
-			$notifs = $this->formatNotifs(Item::inArray($items), $ident);
-		}
-
-		$arr = [
-			'notifications' => $notifs,
-			'ident' => $ident,
-		];
-
-		return $arr;
-	}
-
-	/**
-	 * @brief Get introductions
-	 *
-	 * @param bool $all     If false only include introductions into the query
-	 *                      which aren't marked as ignored
-	 * @param int  $start   Start the query at this point
-	 * @param int  $limit   Maximum number of query results
-	 * @param int  $id      When set, only the introduction with this id is displayed
-	 *
-	 * @return array with
-	 *    string 'ident' => Notification identifier
-	 *    array 'notifications' => Introductions
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 * @throws \ImagickException
-	 */
-	public function introNotifs($all = false, $start = 0, $limit = 80, $id = 0)
-	{
-		$ident = 'introductions';
-		$notifs = [];
-		$sql_extra = "";
-
-		if (empty($id)) {
-			if (!$all) {
-				$sql_extra = " AND NOT `ignore` ";
-			}
-
-			$sql_extra .= " AND NOT `intro`.`blocked` ";
-		} else {
-			$sql_extra = sprintf(" AND `intro`.`id` = %d ", intval($id));
-		}
-
-		/// @todo Fetch contact details by "Contact::getDetailsByUrl" instead of queries to contact, fcontact and gcontact
-		$stmtNotifies = DBA::p(
-			"SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*,
-				`fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`, `fcontact`.`addr` AS `faddr`,
-				`fcontact`.`photo` AS `fphoto`, `fcontact`.`request` AS `frequest`,
-				`gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`,
-				`gcontact`.`keywords` AS `gkeywords`, `gcontact`.`gender` AS `ggender`,
-				`gcontact`.`network` AS `gnetwork`, `gcontact`.`addr` AS `gaddr`
-			FROM `intro`
-				LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id`
-				LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl`
-				LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
-			WHERE `intro`.`uid` = ? $sql_extra
-			LIMIT ?, ?",
-			$_SESSION['uid'],
-			$start,
-			$limit
-		);
-		if (DBA::isResult($stmtNotifies)) {
-			$notifs = $this->formatIntros(DBA::toArray($stmtNotifies));
-		}
-
-		$arr = [
-			'ident' => $ident,
-			'notifications' => $notifs,
-		];
-
-		return $arr;
-	}
-
-	/**
-	 * @brief Format the notification query in an usable array
-	 *
-	 * @param array $intros The array from the db query
-	 * @return array with the introductions
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 * @throws \ImagickException
-	 */
-	private function formatIntros($intros)
-	{
-		$knowyou = '';
-
-		$arr = [];
-
-		foreach ($intros as $it) {
-			// There are two kind of introduction. Contacts suggested by other contacts and normal connection requests.
-			// We have to distinguish between these two because they use different data.
-			// Contact suggestions
-			if ($it['fid']) {
-				$return_addr = bin2hex(self::getApp()->user['nickname'] . '@' . self::getApp()->getHostName() . ((self::getApp()->getURLPath()) ? '/' . self::getApp()->getURLPath() : ''));
-
-				$intro = [
-					'label' => 'friend_suggestion',
-					'notify_type' => L10n::t('Friend Suggestion'),
-					'intro_id' => $it['intro_id'],
-					'madeby' => $it['name'],
-					'madeby_url' => $it['url'],
-					'madeby_zrl' => Contact::magicLink($it['url']),
-					'madeby_addr' => $it['addr'],
-					'contact_id' => $it['contact-id'],
-					'photo' => (!empty($it['fphoto']) ? ProxyUtils::proxifyUrl($it['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
-					'name' => $it['fname'],
-					'url' => $it['furl'],
-					'zrl' => Contact::magicLink($it['furl']),
-					'hidden' => $it['hidden'] == 1,
-					'post_newfriend' => (intval(PConfig::get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
-					'knowyou' => $knowyou,
-					'note' => $it['note'],
-					'request' => $it['frequest'] . '?addr=' . $return_addr,
-				];
-
-				// Normal connection requests
-			} else {
-				$it = $this->getMissingIntroData($it);
-
-				if (empty($it['url'])) {
-					continue;
-				}
-
-				// Don't show these data until you are connected. Diaspora is doing the same.
-				if ($it['gnetwork'] === Protocol::DIASPORA) {
-					$it['glocation'] = "";
-					$it['gabout'] = "";
-					$it['ggender'] = "";
-				}
-				$intro = [
-					'label' => (($it['network'] !== Protocol::OSTATUS) ? 'friend_request' : 'follower'),
-					'notify_type' => (($it['network'] !== Protocol::OSTATUS) ? L10n::t('Friend/Connect Request') : L10n::t('New Follower')),
-					'dfrn_id' => $it['issued-id'],
-					'uid' => $_SESSION['uid'],
-					'intro_id' => $it['intro_id'],
-					'contact_id' => $it['contact-id'],
-					'photo' => (!empty($it['photo']) ? ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
-					'name' => $it['name'],
-					'location' => BBCode::convert($it['glocation'], false),
-					'about' => BBCode::convert($it['gabout'], false),
-					'keywords' => $it['gkeywords'],
-					'gender' => $it['ggender'],
-					'hidden' => $it['hidden'] == 1,
-					'post_newfriend' => (intval(PConfig::get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
-					'url' => $it['url'],
-					'zrl' => Contact::magicLink($it['url']),
-					'addr' => $it['gaddr'],
-					'network' => $it['gnetwork'],
-					'knowyou' => $it['knowyou'],
-					'note' => $it['note'],
-				];
-			}
-
-			$arr[] = $intro;
-		}
-
-		return $arr;
-	}
-
-	/**
-	 * @brief Check for missing contact data and try to fetch the data from
-	 *     from other sources
-	 *
-	 * @param array $arr The input array with the intro data
-	 *
-	 * @return array The array with the intro data
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	private function getMissingIntroData($arr)
-	{
-		// If the network and the addr isn't available from the gcontact
-		// table entry, take the one of the contact table entry
-		if (empty($arr['gnetwork']) && !empty($arr['network'])) {
-			$arr['gnetwork'] = $arr['network'];
-		}
-		if (empty($arr['gaddr']) && !empty($arr['addr'])) {
-			$arr['gaddr'] = $arr['addr'];
-		}
-
-		// If the network and addr is still not available
-		// get the missing data data from other sources
-		if (empty($arr['gnetwork']) || empty($arr['gaddr'])) {
-			$ret = Contact::getDetailsByURL($arr['url']);
-
-			if (empty($arr['gnetwork']) && !empty($ret['network'])) {
-				$arr['gnetwork'] = $ret['network'];
-			}
-			if (empty($arr['gaddr']) && !empty($ret['addr'])) {
-				$arr['gaddr'] = $ret['addr'];
-			}
-		}
-
-		return $arr;
-	}
-}
diff --git a/src/Model/Notify.php b/src/Model/Notify.php
new file mode 100644
index 000000000..8a60ee6c0
--- /dev/null
+++ b/src/Model/Notify.php
@@ -0,0 +1,775 @@
+<?php
+
+namespace Friendica\Model;
+
+use Exception;
+use Friendica\App;
+use Friendica\BaseObject;
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
+use Friendica\Core\Config\PConfiguration;
+use Friendica\Core\L10n\L10n;
+use Friendica\Core\Protocol;
+use Friendica\Core\System;
+use Friendica\Database\Database;
+use Friendica\Protocol\Activity;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Temporal;
+use Friendica\Util\XML;
+use ImagickException;
+use Psr\Log\LoggerInterface;
+use Friendica\Network\HTTPException;
+
+/**
+ * @brief Methods for read and write notifications from/to database
+ *  or for formatting notifications
+ */
+final class Notify extends BaseObject
+{
+	/** @var int The default limit of notifies per page */
+	const DEFAULT_PAGE_LIMIT = 80;
+
+	const NETWORK  = 'network';
+	const SYSTEM   = 'system';
+	const PERSONAL = 'personal';
+	const HOME     = 'home';
+	const INTRO    = 'intro';
+
+	/** @var array Array of URL parameters */
+	const URL_TYPES = [
+		self::NETWORK  => 'network',
+		self::SYSTEM   => 'system',
+		self::HOME     => 'home',
+		self::PERSONAL => 'personal',
+		self::INTRO    => 'intros',
+	];
+
+	/** @var array Array of the allowed notifies and their printable name */
+	const PRINT_TYPES = [
+		self::NETWORK  => 'Network',
+		self::SYSTEM   => 'System',
+		self::HOME     => 'Home',
+		self::PERSONAL => 'Personal',
+		self::INTRO    => 'Introductions',
+	];
+
+	/** @var array The array of access keys for notify pages */
+	const ACCESS_KEYS = [
+		self::NETWORK  => 'w',
+		self::SYSTEM   => 'y',
+		self::HOME     => 'h',
+		self::PERSONAL => 'r',
+		self::INTRO    => 'i',
+	];
+
+	/** @var Database */
+	private $dba;
+	/** @var L10n */
+	private $l10n;
+	/** @var App\Arguments */
+	private $args;
+	/** @var App\BaseURL */
+	private $baseUrl;
+	/** @var PConfiguration */
+	private $pConfig;
+	/** @var LoggerInterface */
+	private $logger;
+
+	public function __construct(Database $dba, L10n $l10n, App\Arguments $args, App\BaseURL $baseUrl,
+	                            PConfiguration $pConfig, LoggerInterface $logger)
+	{
+		$this->dba     = $dba;
+		$this->l10n    = $l10n;
+		$this->args    = $args;
+		$this->baseUrl = $baseUrl;
+		$this->pConfig = $pConfig;
+		$this->logger  = $logger;
+	}
+
+	/**
+	 * Set some extra properties to note array from db:
+	 *  - timestamp as int in default TZ
+	 *  - date_rel : relative date string
+	 *  - msg_html: message as html string
+	 *  - msg_plain: message as plain text string
+	 *
+	 * @param array $notes array of note arrays from db
+	 *
+	 * @return array Copy of input array with added properties
+	 *
+	 * @throws Exception
+	 */
+	private function setExtra(array $notes)
+	{
+		$retNotes = [];
+		foreach ($notes as $note) {
+			$local_time        = DateTimeFormat::local($note['date']);
+			$note['timestamp'] = strtotime($local_time);
+			$note['date_rel']  = Temporal::getRelativeDate($note['date']);
+			$note['msg_html']  = BBCode::convert($note['msg'], false);
+			$note['msg_plain'] = explode("\n", trim(HTML::toPlaintext($note['msg_html'], 0)))[0];
+
+			$retNotes[] = $note;
+		}
+		return $retNotes;
+	}
+
+	/**
+	 * Get all notifications for local_user()
+	 *
+	 * @param array  $filter optional Array "column name"=>value: filter query by columns values
+	 * @param array  $order  optional Array to order by
+	 * @param string $limit  optional Query limits
+	 *
+	 * @return array|bool of results or false on errors
+	 * @throws Exception
+	 */
+	public function getAll(array $filter = [], array $order = ['date' => 'DESC'], string $limit = "")
+	{
+		$params = [];
+
+		$params['order'] = $order;
+
+		if (!empty($limit)) {
+			$params['limit'] = $limit;
+		}
+
+		$dbFilter = array_merge($filter, ['uid' => local_user()]);
+
+		$stmtNotifies = $this->dba->select('notify', [], $dbFilter, $params);
+
+		if ($this->dba->isResult($stmtNotifies)) {
+			return $this->setExtra($this->dba->toArray($stmtNotifies));
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get one note for local_user() by $id value
+	 *
+	 * @param int $id identity
+	 *
+	 * @return array note values or null if not found
+	 * @throws Exception
+	 */
+	public function getByID(int $id)
+	{
+		$stmtNotify = $this->dba->selectFirst('notify', [], ['id' => $id, 'uid' => local_user()]);
+		if ($this->dba->isResult($stmtNotify)) {
+			return $this->setExtra([$stmtNotify])[0];
+		}
+		return null;
+	}
+
+	/**
+	 * @brief set seen state of $note of local_user()
+	 *
+	 * @param array $note note array
+	 * @param bool  $seen optional true or false, default true
+	 *
+	 * @return bool true on success, false on errors
+	 * @throws Exception
+	 */
+	public function setSeen(array $note, bool $seen = true)
+	{
+		return $this->dba->update('notify', ['seen' => $seen], [
+			'(`link` = ? OR (`parent` != 0 AND `parent` = ? AND `otype` = ?)) AND `uid` = ?',
+			$note['link'],
+			$note['parent'],
+			$note['otype'],
+			local_user()
+		]);
+	}
+
+	/**
+	 * Set seen state of all notifications of local_user()
+	 *
+	 * @param bool $seen optional true or false. default true
+	 *
+	 * @return bool true on success, false on error
+	 * @throws Exception
+	 */
+	public function setAllSeen(bool $seen = true)
+	{
+		return $this->dba->update('notify', ['seen' => $seen], ['uid' => local_user()]);
+	}
+
+	/**
+	 * @brief List of pages for the Notifications TabBar
+	 *
+	 * @return array with with notifications TabBar data
+	 * @throws Exception
+	 */
+	public function getTabs()
+	{
+		$selected = $this->args->get(1, '');
+
+		$tabs = [];
+
+		foreach (self::URL_TYPES as $type => $url) {
+			$tabs[] = [
+				'label'     => $this->l10n->t(self::PRINT_TYPES[$type]),
+				'url'       => 'notifications/' . $url,
+				'sel'       => (($selected == $url) ? 'active' : ''),
+				'id'        => $type . '-tab',
+				'accesskey' => self::ACCESS_KEYS[$type],
+			];
+		}
+
+		return $tabs;
+	}
+
+	/**
+	 * Format the notification query in an usable array
+	 *
+	 * @param array  $notifies The array from the db query
+	 * @param string $ident    The notifications identifier (e.g. network)
+	 *
+	 * @return array
+	 *                       string 'label' => The type of the notification
+	 *                       string 'link' => URL to the source
+	 *                       string 'image' => The avatar image
+	 *                       string 'url' => The profile url of the contact
+	 *                       string 'text' => The notification text
+	 *                       string 'when' => The date of the notification
+	 *                       string 'ago' => T relative date of the notification
+	 *                       bool 'seen' => Is the notification marked as "seen"
+	 * @throws Exception
+	 */
+	private function formatList(array $notifies, string $ident = "")
+	{
+		$formattedNotifies = [];
+
+		foreach ($notifies as $notify) {
+			// Because we use different db tables for the notification query
+			// we have sometimes $notify['unseen'] and sometimes $notify['seen].
+			// So we will have to transform $notify['unseen']
+			if (array_key_exists('unseen', $notify)) {
+				$notify['seen'] = ($notify['unseen'] > 0 ? false : true);
+			}
+
+			// For feed items we use the user's contact, since the avatar is mostly self choosen.
+			if (!empty($notify['network']) && $notify['network'] == Protocol::FEED) {
+				$notify['author-avatar'] = $notify['contact-avatar'];
+			}
+
+			// Depending on the identifier of the notification we need to use different defaults
+			switch ($ident) {
+				case self::SYSTEM:
+					$default_item_label = 'notify';
+					$default_item_link  = $this->baseUrl->get(true) . '/notify/view/' . $notify['id'];
+					$default_item_image = ProxyUtils::proxifyUrl($notify['photo'], false, ProxyUtils::SIZE_MICRO);
+					$default_item_url   = $notify['url'];
+					$default_item_text  = strip_tags(BBCode::convert($notify['msg']));
+					$default_item_when  = DateTimeFormat::local($notify['date'], 'r');
+					$default_item_ago   = Temporal::getRelativeDate($notify['date']);
+					break;
+
+				case self::HOME:
+					$default_item_label = 'comment';
+					$default_item_link  = $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'];
+					$default_item_image = ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO);
+					$default_item_url   = $notify['author-link'];
+					$default_item_text  = $this->l10n->t("%s commented on %s's post", $notify['author-name'], $notify['parent-author-name']);
+					$default_item_when  = DateTimeFormat::local($notify['created'], 'r');
+					$default_item_ago   = Temporal::getRelativeDate($notify['created']);
+					break;
+
+				default:
+					$default_item_label = (($notify['id'] == $notify['parent']) ? 'post' : 'comment');
+					$default_item_link  = $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'];
+					$default_item_image = ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO);
+					$default_item_url   = $notify['author-link'];
+					$default_item_text  = (($notify['id'] == $notify['parent'])
+						? $this->l10n->t("%s created a new post", $notify['author-name'])
+						: $this->l10n->t("%s commented on %s's post", $notify['author-name'], $notify['parent-author-name']));
+					$default_item_when  = DateTimeFormat::local($notify['created'], 'r');
+					$default_item_ago   = Temporal::getRelativeDate($notify['created']);
+			}
+
+			// Transform the different types of notification in an usable array
+			switch ($notify['verb']) {
+				case Activity::LIKE:
+					$formattedNotify = [
+						'label' => 'like',
+						'link'  => $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'],
+						'image' => ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO),
+						'url'   => $notify['author-link'],
+						'text'  => $this->l10n->t("%s liked %s's post", $notify['author-name'], $notify['parent-author-name']),
+						'when'  => $default_item_when,
+						'ago'   => $default_item_ago,
+						'seen'  => $notify['seen']
+					];
+					break;
+
+				case Activity::DISLIKE:
+					$formattedNotify = [
+						'label' => 'dislike',
+						'link'  => $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'],
+						'image' => ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO),
+						'url'   => $notify['author-link'],
+						'text'  => $this->l10n->t("%s disliked %s's post", $notify['author-name'], $notify['parent-author-name']),
+						'when'  => $default_item_when,
+						'ago'   => $default_item_ago,
+						'seen'  => $notify['seen']
+					];
+					break;
+
+				case Activity::ATTEND:
+					$formattedNotify = [
+						'label' => 'attend',
+						'link'  => $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'],
+						'image' => ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO),
+						'url'   => $notify['author-link'],
+						'text'  => $this->l10n->t("%s is attending %s's event", $notify['author-name'], $notify['parent-author-name']),
+						'when'  => $default_item_when,
+						'ago'   => $default_item_ago,
+						'seen'  => $notify['seen']
+					];
+					break;
+
+				case Activity::ATTENDNO:
+					$formattedNotify = [
+						'label' => 'attendno',
+						'link'  => $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'],
+						'image' => ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO),
+						'url'   => $notify['author-link'],
+						'text'  => $this->l10n->t("%s is not attending %s's event", $notify['author-name'], $notify['parent-author-name']),
+						'when'  => $default_item_when,
+						'ago'   => $default_item_ago,
+						'seen'  => $notify['seen']
+					];
+					break;
+
+				case Activity::ATTENDMAYBE:
+					$formattedNotify = [
+						'label' => 'attendmaybe',
+						'link'  => $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'],
+						'image' => ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO),
+						'url'   => $notify['author-link'],
+						'text'  => $this->l10n->t("%s may attend %s's event", $notify['author-name'], $notify['parent-author-name']),
+						'when'  => $default_item_when,
+						'ago'   => $default_item_ago,
+						'seen'  => $notify['seen']
+					];
+					break;
+
+				case Activity::FRIEND:
+					if (!isset($notify['object'])) {
+						$formattedNotify = [
+							'label' => 'friend',
+							'link'  => $default_item_link,
+							'image' => $default_item_image,
+							'url'   => $default_item_url,
+							'text'  => $default_item_text,
+							'when'  => $default_item_when,
+							'ago'   => $default_item_ago,
+							'seen'  => $notify['seen']
+						];
+						break;
+					}
+					/// @todo Check if this part here is used at all
+					$this->logger->info('Complete data.', ['notify' => $notify, 'callStack' => System::callstack(20)]);
+
+					$xmlHead         = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
+					$obj             = XML::parseString($xmlHead . $notify['object']);
+					$notify['fname'] = $obj->title;
+
+					$formattedNotify = [
+						'label' => 'friend',
+						'link'  => $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'],
+						'image' => ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO),
+						'url'   => $notify['author-link'],
+						'text'  => $this->l10n->t("%s is now friends with %s", $notify['author-name'], $notify['fname']),
+						'when'  => $default_item_when,
+						'ago'   => $default_item_ago,
+						'seen'  => $notify['seen']
+					];
+					break;
+
+				default:
+					$formattedNotify = [
+						'label' => $default_item_label,
+						'link'  => $default_item_link,
+						'image' => $default_item_image,
+						'url'   => $default_item_url,
+						'text'  => $default_item_text,
+						'when'  => $default_item_when,
+						'ago'   => $default_item_ago,
+						'seen'  => $notify['seen']
+					];
+			}
+
+			$formattedNotifies[] = $formattedNotify;
+		}
+
+		return $formattedNotifies;
+	}
+
+	/**
+	 * Get network notifications
+	 *
+	 * @param bool $seen    False => only include notifications into the query
+	 *                            which aren't marked as "seen"
+	 * @param int        $start   Start the query at this point
+	 * @param int        $limit   Maximum number of query results
+	 *
+	 * @return array [string, array]
+	 *    string 'ident' => Notification identifier
+	 *    array 'notifications' => Network notifications
+	 *
+	 * @throws Exception
+	 */
+	public function getNetworkList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
+	{
+		$ident    = self::NETWORK;
+		$notifies = [];
+
+		$condition = ['wall' => false, 'uid' => local_user()];
+
+		if (!$seen) {
+			$condition['unseen'] = true;
+		}
+
+		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
+			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
+		$params = ['order' => ['received' => true], 'limit' => [$start, $limit]];
+
+		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
+
+		if ($this->dba->isResult($items)) {
+			$notifies = $this->formatList(Item::inArray($items), $ident);
+		}
+
+		$arr = [
+			'notifications' => $notifies,
+			'ident'         => $ident,
+		];
+
+		return $arr;
+	}
+
+	/**
+	 * Get system notifications
+	 *
+	 * @param bool $seen    False => only include notifications into the query
+	 *                            which aren't marked as "seen"
+	 * @param int        $start   Start the query at this point
+	 * @param int        $limit   Maximum number of query results
+	 *
+	 * @return array [string, array]
+	 *    string 'ident' => Notification identifier
+	 *    array 'notifications' => System notifications
+	 *
+	 * @throws Exception
+	 */
+	public function getSystemList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
+	{
+		$ident    = self::SYSTEM;
+		$notifies = [];
+
+		$filter = ['uid' => local_user()];
+		if (!$seen) {
+			$filter['seen'] = false;
+		}
+
+		$params          = [];
+		$params['order'] = ['date' => 'DESC'];
+		$params['limit'] = [$start, $limit];
+
+		$stmtNotifies = $this->dba->select('notify',
+			['id', 'url', 'photo', 'msg', 'date', 'seen', 'verb'],
+			$filter,
+			$params);
+
+		if ($this->dba->isResult($stmtNotifies)) {
+			$notifies = $this->formatList($this->dba->toArray($stmtNotifies), $ident);
+		}
+
+		$arr = [
+			'notifications' => $notifies,
+			'ident'         => $ident,
+		];
+
+		return $arr;
+	}
+
+	/**
+	 * Get personal notifications
+	 *
+	 * @param bool $seen    False => only include notifications into the query
+	 *                            which aren't marked as "seen"
+	 * @param int        $start   Start the query at this point
+	 * @param int        $limit   Maximum number of query results
+	 *
+	 * @return array [string, array]
+	 *    string 'ident' => Notification identifier
+	 *    array 'notifications' => Personal notifications
+	 *
+	 * @throws Exception
+	 */
+	public function getPersonalList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
+	{
+		$ident    = self::PERSONAL;
+		$notifies = [];
+
+		$myurl     = str_replace('http://', '', self::getApp()->contact['nurl']);
+		$diasp_url = str_replace('/profile/', '/u/', $myurl);
+
+		$condition = ["NOT `wall` AND `uid` = ? AND (`item`.`author-id` = ? OR `item`.`tag` REGEXP ? OR `item`.`tag` REGEXP ?)",
+			local_user(), public_contact(), $myurl . '\\]', $diasp_url . '\\]'];
+
+		if (!$seen) {
+			$condition[0] .= " AND `unseen`";
+		}
+
+		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
+			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
+		$params = ['order' => ['received' => true], 'limit' => [$start, $limit]];
+
+		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
+
+		if ($this->dba->isResult($items)) {
+			$notifies = $this->formatList(Item::inArray($items), $ident);
+		}
+
+		$arr = [
+			'notifications' => $notifies,
+			'ident'         => $ident,
+		];
+
+		return $arr;
+	}
+
+	/**
+	 * @brief Get home notifications
+	 *
+	 * @param bool $seen    False => only include notifications into the query
+	 *                            which aren't marked as "seen"
+	 * @param int        $start   Start the query at this point
+	 * @param int        $limit   Maximum number of query results
+	 *
+	 * @return array [string, array]
+	 *    string 'ident' => Notification identifier
+	 *    array 'notifications' => Home notifications
+	 *
+	 * @throws Exception
+	 */
+	public function getHomeList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
+	{
+		$ident    = self::HOME;
+		$notifies = [];
+
+		$condition = ['wall' => false, 'uid' => local_user()];
+
+		if (!$seen) {
+			$condition['unseen'] = true;
+		}
+
+		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
+			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
+		$params = ['order' => ['received' => true], 'limit' => [$start, $limit]];
+
+		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
+
+		if ($this->dba->isResult($items)) {
+			$notifies = $this->formatList(Item::inArray($items), $ident);
+		}
+
+		$arr = [
+			'notifications' => $notifies,
+			'ident'         => $ident,
+		];
+
+		return $arr;
+	}
+
+	/**
+	 * @brief Get introductions
+	 *
+	 * @param bool $all     If false only include introductions into the query
+	 *                      which aren't marked as ignored
+	 * @param int  $start   Start the query at this point
+	 * @param int  $limit   Maximum number of query results
+	 * @param int  $id      When set, only the introduction with this id is displayed
+	 *
+	 * @return array [string, array]
+	 *    string 'ident' => Notification identifier
+	 *    array 'notifications' => Introductions
+	 *
+	 * @throws ImagickException
+	 * @throws Exception
+	 */
+	public function getIntroList(bool $all = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT, int $id = 0)
+	{
+		/// @todo sanitize wording according to SELF::INTRO
+		$ident     = 'introductions';
+		$notifies  = [];
+		$sql_extra = "";
+
+		if (empty($id)) {
+			if (!$all) {
+				$sql_extra = " AND NOT `ignore` ";
+			}
+
+			$sql_extra .= " AND NOT `intro`.`blocked` ";
+		} else {
+			$sql_extra = sprintf(" AND `intro`.`id` = %d ", intval($id));
+		}
+
+		/// @todo Fetch contact details by "Contact::getDetailsByUrl" instead of queries to contact, fcontact and gcontact
+		$stmtNotifies = $this->dba->p(
+			"SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*,
+				`fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`, `fcontact`.`addr` AS `faddr`,
+				`fcontact`.`photo` AS `fphoto`, `fcontact`.`request` AS `frequest`,
+				`gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`,
+				`gcontact`.`keywords` AS `gkeywords`, `gcontact`.`gender` AS `ggender`,
+				`gcontact`.`network` AS `gnetwork`, `gcontact`.`addr` AS `gaddr`
+			FROM `intro`
+				LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id`
+				LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl`
+				LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
+			WHERE `intro`.`uid` = ? $sql_extra
+			LIMIT ?, ?",
+			$_SESSION['uid'],
+			$start,
+			$limit
+		);
+		if ($this->dba->isResult($stmtNotifies)) {
+			$notifies = $this->formatIntroList($this->dba->toArray($stmtNotifies));
+		}
+
+		$arr = [
+			'ident'         => $ident,
+			'notifications' => $notifies,
+		];
+
+		return $arr;
+	}
+
+	/**
+	 * @brief Format the notification query in an usable array
+	 *
+	 * @param array $intros The array from the db query
+	 *
+	 * @return array with the introductions
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws ImagickException
+	 */
+	private function formatIntroList(array $intros)
+	{
+		$knowyou = '';
+
+		$formattedIntros = [];
+
+		foreach ($intros as $intro) {
+			// There are two kind of introduction. Contacts suggested by other contacts and normal connection requests.
+			// We have to distinguish between these two because they use different data.
+			// Contact suggestions
+			if ($intro['fid']) {
+				$return_addr = bin2hex(self::getApp()->user['nickname'] . '@' .
+				                       $this->baseUrl->getHostName() .
+				                       (($this->baseUrl->getURLPath()) ? '/' . $this->baseUrl->getURLPath() : ''));
+
+				$intro = [
+					'label'          => 'friend_suggestion',
+					'notify_type'    => $this->l10n->t('Friend Suggestion'),
+					'intro_id'       => $intro['intro_id'],
+					'madeby'         => $intro['name'],
+					'madeby_url'     => $intro['url'],
+					'madeby_zrl'     => Contact::magicLink($intro['url']),
+					'madeby_addr'    => $intro['addr'],
+					'contact_id'     => $intro['contact-id'],
+					'photo'          => (!empty($intro['fphoto']) ? ProxyUtils::proxifyUrl($intro['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
+					'name'           => $intro['fname'],
+					'url'            => $intro['furl'],
+					'zrl'            => Contact::magicLink($intro['furl']),
+					'hidden'         => $intro['hidden'] == 1,
+					'post_newfriend' => (intval($this->pConfig->get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
+					'knowyou'        => $knowyou,
+					'note'           => $intro['note'],
+					'request'        => $intro['frequest'] . '?addr=' . $return_addr,
+				];
+
+				// Normal connection requests
+			} else {
+				$intro = $this->getMissingIntroData($intro);
+
+				if (empty($intro['url'])) {
+					continue;
+				}
+
+				// Don't show these data until you are connected. Diaspora is doing the same.
+				if ($intro['gnetwork'] === Protocol::DIASPORA) {
+					$intro['glocation'] = "";
+					$intro['gabout']    = "";
+					$intro['ggender']   = "";
+				}
+				$intro = [
+					'label'          => (($intro['network'] !== Protocol::OSTATUS) ? 'friend_request' : 'follower'),
+					'notify_type'    => (($intro['network'] !== Protocol::OSTATUS) ? $this->l10n->t('Friend/Connect Request') : $this->l10n->t('New Follower')),
+					'dfrn_id'        => $intro['issued-id'],
+					'uid'            => $_SESSION['uid'],
+					'intro_id'       => $intro['intro_id'],
+					'contact_id'     => $intro['contact-id'],
+					'photo'          => (!empty($intro['photo']) ? ProxyUtils::proxifyUrl($intro['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
+					'name'           => $intro['name'],
+					'location'       => BBCode::convert($intro['glocation'], false),
+					'about'          => BBCode::convert($intro['gabout'], false),
+					'keywords'       => $intro['gkeywords'],
+					'gender'         => $intro['ggender'],
+					'hidden'         => $intro['hidden'] == 1,
+					'post_newfriend' => (intval($this->pConfig->get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
+					'url'            => $intro['url'],
+					'zrl'            => Contact::magicLink($intro['url']),
+					'addr'           => $intro['gaddr'],
+					'network'        => $intro['gnetwork'],
+					'knowyou'        => $intro['knowyou'],
+					'note'           => $intro['note'],
+				];
+			}
+
+			$formattedIntros[] = $intro;
+		}
+
+		return $formattedIntros;
+	}
+
+	/**
+	 * @brief Check for missing contact data and try to fetch the data from
+	 *     from other sources
+	 *
+	 * @param array $intro The input array with the intro data
+	 *
+	 * @return array The array with the intro data
+	 * @throws HTTPException\InternalServerErrorException
+	 */
+	private function getMissingIntroData(array $intro)
+	{
+		// If the network and the addr isn't available from the gcontact
+		// table entry, take the one of the contact table entry
+		if (empty($intro['gnetwork']) && !empty($intro['network'])) {
+			$intro['gnetwork'] = $intro['network'];
+		}
+		if (empty($intro['gaddr']) && !empty($intro['addr'])) {
+			$intro['gaddr'] = $intro['addr'];
+		}
+
+		// If the network and addr is still not available
+		// get the missing data data from other sources
+		if (empty($intro['gnetwork']) || empty($intro['gaddr'])) {
+			$ret = Contact::getDetailsByURL($intro['url']);
+
+			if (empty($intro['gnetwork']) && !empty($ret['network'])) {
+				$intro['gnetwork'] = $ret['network'];
+			}
+			if (empty($intro['gaddr']) && !empty($ret['addr'])) {
+				$intro['gaddr'] = $ret['addr'];
+			}
+		}
+
+		return $intro;
+	}
+}
diff --git a/src/Module/Notifications/Notify.php b/src/Module/Notifications/Notify.php
index d31de2cdd..bad0900ea 100644
--- a/src/Module/Notifications/Notify.php
+++ b/src/Module/Notifications/Notify.php
@@ -3,9 +3,10 @@
 namespace Friendica\Module\Notifications;
 
 use Friendica\BaseModule;
+use Friendica\BaseObject;
 use Friendica\Core\L10n;
-use Friendica\Core\NotificationsManager;
 use Friendica\Core\System;
+use Friendica\Model\Notify as ModelNotify;
 use Friendica\Network\HTTPException;
 
 /**
@@ -26,7 +27,8 @@ class Notify extends BaseModule
 
 		// @TODO: Replace with parameter from router
 		if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all') {
-			$notificationsManager = new NotificationsManager();
+			/** @var ModelNotify $notificationsManager */
+			$notificationsManager = self::getClass(ModelNotify::class);
 			$success              = $notificationsManager->setAllSeen();
 
 			header('Content-type: application/json; charset=utf-8');
@@ -49,7 +51,8 @@ class Notify extends BaseModule
 
 		// @TODO: Replace with parameter from router
 		if ($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
-			$notificationsManager = new NotificationsManager();
+			/** @var ModelNotify $notificationsManager */
+			$notificationsManager = BaseObject::getClass(ModelNotify::class);
 			// @TODO: Replace with parameter from router
 			$note = $notificationsManager->getByID($a->argv[2]);
 			if (!empty($note)) {