diff --git a/include/diaspora.php b/include/diaspora.php
index c450a10d1..18206be8e 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2256,6 +2256,40 @@ class diaspora {
 		return $nick."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3);
 	}
 
+	/**
+	 * @brief Creates the envelope for the "fetch" endpoint
+	 *
+	 * @param string $msg The message that is to be transmitted
+	 * @param array $user The record of the sender
+	 *
+	 * @return string The envelope
+	 */
+
+	function build_magic_envelope($msg, $user) {
+
+		$b64url_data = base64url_encode($msg);
+		$data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
+
+		$key_id = base64url_encode(diaspora::my_handle($user));
+		$type = "application/xml";
+		$encoding = "base64url";
+		$alg = "RSA-SHA256";
+		$signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg);
+		$signature = rsa_sign($signable_data, $user["prvkey"]);
+		$sig = base64url_encode($signature);
+
+		$xmldata = array("me:env" => array("me:data" => $data,
+							"@attributes" => array("type" => $type),
+							"me:encoding" => $encoding,
+							"me:alg" => $alg,
+							"me:sig" => $sig,
+							"@attributes2" => array("key_id" => $key_id)));
+
+		$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
+
+		return xml::from_array($xmldata, $xml, false, $namespaces);
+	}
+
 	/**
 	 * @brief Creates the envelope for a public message
 	 *
@@ -2287,11 +2321,11 @@ class diaspora {
 		$sig = base64url_encode($signature);
 
 		$xmldata = array("diaspora" => array("header" => array("author_id" => $handle),
-						"me:env" => array("me:encoding" => "base64url",
-								"me:alg" => "RSA-SHA256",
-								"me:data" => $data,
-								"@attributes" => array("type" => "application/xml"),
-								"me:sig" => $sig)));
+							"me:env" => array("me:encoding" => $encoding,
+							"me:alg" => $alg,
+							"me:data" => $data,
+							"@attributes" => array("type" => $type),
+							"me:sig" => $sig)));
 
 		$namespaces = array("" => "https://joindiaspora.com/protocol",
 				"me" => "http://salmon-protocol.org/ns/magic-env");
@@ -2377,10 +2411,10 @@ class diaspora {
 		$cipher_json = base64_encode($encrypted_header_json_object);
 
 		$xmldata = array("diaspora" => array("encrypted_header" => $cipher_json,
-						"me:env" => array("me:encoding" => "base64url",
-								"me:alg" => "RSA-SHA256",
+						"me:env" => array("me:encoding" => $encoding,
+								"me:alg" => $alg,
 								"me:data" => $data,
-								"@attributes" => array("type" => "application/xml"),
+								"@attributes" => array("type" => $type),
 								"me:sig" => $sig)));
 
 		$namespaces = array("" => "https://joindiaspora.com/protocol",
@@ -2498,6 +2532,20 @@ class diaspora {
 	}
 
 
+	/**
+	 * @brief Build the post xml
+	 *
+	 * @param string $type The message type
+	 * @param array $message The message data
+	 *
+	 * @return string The post XML
+	 */
+	public static function build_post_xml($type, $message) {
+
+		$data = array("XML" => array("post" => array($type => $message)));
+		return xml::from_array($data, $xml);
+	}
+
 	/**
 	 * @brief Builds and transmit messages
 	 *
@@ -2513,9 +2561,7 @@ class diaspora {
 	 */
 	private function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false) {
 
-		$data = array("XML" => array("post" => array($type => $message)));
-
-		$msg = xml::from_array($data, $xml);
+		$msg = self::build_post_xml($type, $message);
 
 		logger('message: '.$msg, LOGGER_DATA);
 		logger('send guid '.$guid, LOGGER_DEBUG);
@@ -2647,16 +2693,16 @@ class diaspora {
 	}
 
 	/**
-	 * @brief Sends a post
+	 * @brief Create a post (status message or reshare)
 	 *
 	 * @param array $item The item that will be exported
 	 * @param array $owner the array of the item owner
-	 * @param array $contact Target of the communication
-	 * @param bool $public_batch Is it a public post?
 	 *
-	 * @return int The result of the transmission
+	 * @return array
+	 * 'type' -> Message type ("status_message" or "reshare")
+	 * 'message' -> Array of XML elements of the status
 	 */
-	public static function send_status($item, $owner, $contact, $public_batch = false) {
+	public static function build_status($item, $owner) {
 
 		$myaddr = self::my_handle($owner);
 
@@ -2719,8 +2765,24 @@ class diaspora {
 
 			$type = "status_message";
 		}
+		return array("type" => $type, "message" => $message);
+	}
 
-		return self::build_and_transmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
+	/**
+	 * @brief Sends a post
+	 *
+	 * @param array $item The item that will be exported
+	 * @param array $owner the array of the item owner
+	 * @param array $contact Target of the communication
+	 * @param bool $public_batch Is it a public post?
+	 *
+	 * @return int The result of the transmission
+	 */
+	public static function send_status($item, $owner, $contact, $public_batch = false) {
+
+		$status = diaspora::build_status($item, $owner);
+
+		return self::build_and_transmit($owner, $contact, $status["type"], $status["message"], $public_batch, $item["guid"]);
 	}
 
 	/**
diff --git a/include/notifier.php b/include/notifier.php
index 7019ffcce..e7eb278ef 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -132,18 +132,25 @@ function notifier_run(&$argv, &$argc){
 		$recipients[] = $suggest[0]['cid'];
 		$item = $suggest[0];
 	} elseif($cmd === 'removeme') {
-		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($item_id));
-		if (! $r)
+		$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
+				`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
+				`user`.`page-flags`, `user`.`prvnets`
+			FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
+				WHERE `contact`.`uid` = %d AND `contact`.`self` LIMIT 1",
+				intval($item_id));
+		if (!$r)
 			return;
 
 		$user = $r[0];
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($item_id));
-		if (! $r)
+
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($item_id));
+		if (!$r)
 			return;
 
 		$self = $r[0];
-		$r = q("SELECT * FROM `contact` WHERE `self` = 0 AND `uid` = %d", intval($item_id));
-		if(! $r)
+
+		$r = q("SELECT * FROM `contact` WHERE NOT `self` AND `uid` = %d", intval($item_id));
+		if(!$r)
 			return;
 
 		require_once('include/Contact.php');
diff --git a/include/xml.php b/include/xml.php
index 39a9102de..ed2f49fb7 100644
--- a/include/xml.php
+++ b/include/xml.php
@@ -44,7 +44,7 @@ class xml {
 		}
 
 		foreach($array as $key => $value) {
-			if ($key == "@attributes") {
+			if (substr($key, 0, 11) == "@attributes") {
 				if (!isset($element) OR !is_array($value))
 					continue;
 
diff --git a/mod/fetch.php b/mod/fetch.php
new file mode 100644
index 000000000..cfcd82bb3
--- /dev/null
+++ b/mod/fetch.php
@@ -0,0 +1,59 @@
+<?php
+/*
+This file is part of the Diaspora protocol. It is used for fetching single public posts.
+*/
+require_once("include/crypto.php");
+require_once("include/diaspora.php");
+require_once("include/xml.php");
+
+function fetch_init($a){
+
+	if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
+		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+		killme();
+	}
+
+	$guid = $a->argv[2];
+
+	// Fetch the item
+	$item = q("SELECT `uid`, `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app`, `location`, `coord`
+			FROM `item` WHERE `wall` AND NOT `private` AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
+		dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
+	if (!$item) {
+		$r = q("SELECT `author-link`
+			FROM `item` WHERE `uid` = 0 AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
+			dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
+		if ($r) {
+			$parts = parse_url($r[0]["author-link"]);
+			$host = $parts["scheme"]."://".$parts["host"];
+
+			$location = $host."/fetch/".$a->argv[1]."/".urlencode($guid);
+
+			header("HTTP/1.1 301 Moved Permanently");
+			header("Location:".$location);
+			killme();
+		}
+
+		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+		killme();
+	}
+
+	// Fetch some data from the author (We could combine both queries - but I think this is more readable)
+	$r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
+		INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
+		WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
+	if (!$r) {
+		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+		killme();
+	}
+	$user = $r[0];
+
+	$status = diaspora::build_status($item[0], $user);
+	$xml = diaspora::build_post_xml($status["type"], $status["message"]);
+
+	// Send the envelope
+	header("Content-Type: application/magic-envelope+xml; charset=utf-8");
+	echo diaspora::build_magic_envelope($xml, $user);
+
+	killme();
+}
diff --git a/mod/p.php b/mod/p.php
index 20d6cfdba..899b51116 100644
--- a/mod/p.php
+++ b/mod/p.php
@@ -19,62 +19,43 @@ function p_init($a){
 
 	$guid = strtolower(substr($guid, 0, -4));
 
-	$item = q("SELECT `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app` FROM `item` WHERE `uid` = 0 AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
+	// Fetch the item
+	$item = q("SELECT `uid`, `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app`, `location`, `coord`
+			FROM `item` WHERE `wall` AND NOT `private` AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
 		dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
 	if (!$item) {
+		$r = q("SELECT `author-link`
+			FROM `item` WHERE `uid` = 0 AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
+			dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
+		if ($r) {
+			$parts = parse_url($r[0]["author-link"]);
+			$host = $parts["scheme"]."://".$parts["host"];
+
+			$location = $host."/p/".urlencode($guid).".xml";
+
+			header("HTTP/1.1 301 Moved Permanently");
+			header("Location:".$location);
+			killme();
+		}
+
 		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
 		killme();
 	}
 
-	$post = array();
-
-	$reshared = diaspora::is_reshare($item[0]["body"]);
-
-	if ($reshared) {
-		$nodename = "reshare";
-		$post["root_diaspora_id"] = $reshared["root_handle"];
-		$post["root_guid"] = $reshared["root_guid"];
-		$post["guid"] = $item[0]["guid"];
-		$post["diaspora_handle"] = diaspora::handle_from_contact($item[0]["contact-id"]);
-		$post["public"] = (!$item[0]["private"] ? 'true':'false');
-		$post["created_at"] = datetime_convert('UTC','UTC',$item[0]["created"]);
-	} else {
-
-		$body = bb2diaspora($item[0]["body"]);
-
-		if(strlen($item[0]["title"]))
-			$body = "## ".html_entity_decode($item[0]["title"])."\n\n".$body;
-
-		$nodename = "status_message";
-		$post["raw_message"] = str_replace("&", "&amp;", $body);
-		$post["guid"] = $item[0]["guid"];
-		$post["diaspora_handle"] = diaspora::handle_from_contact($item[0]["contact-id"]);
-		$post["public"] = (!$item[0]["private"] ? 'true':'false');
-		$post["created_at"] = datetime_convert('UTC','UTC',$item[0]["created"]);
-		$post["provider_display_name"] = $item[0]["app"];
+	// Fetch some data from the author (We could combine both queries - but I think this is more readable)
+	$r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
+		INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
+		WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
+	if (!$r) {
+		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+		killme();
 	}
+	$user = $r[0];
 
-	$dom = new DOMDocument("1.0");
-	$root = $dom->createElement("XML");
-	$dom->appendChild($root);
-	$postelement = $dom->createElement("post");
-	$root->appendChild($postelement);
-	$statuselement = $dom->createElement($nodename);
-	$postelement->appendChild($statuselement);
-
-	foreach($post AS $index => $value) {
-		$postnode = $dom->createElement($index, $value);
-		$statuselement->appendChild($postnode);
-	}
+	$status = diaspora::build_status($item[0], $user);
+	$xml = diaspora::build_post_xml($status["type"], $status["message"]);
 
 	header("Content-Type: application/xml; charset=utf-8");
-	$xml = $dom->saveXML();
-
-	// Diaspora doesn't send the XML header, so we remove them as well.
-	// So we avoid possible compatibility problems.
-	if (substr($xml, 0, 21) == '<?xml version="1.0"?>')
-		$xml = trim(substr($xml, 21));
-
 	echo $xml;
 
 	killme();