diff --git a/include/diaspora.php b/include/diaspora.php
index b70cffdc39..86a55f473f 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1,5 +1,11 @@
 <?php
 
+/*
+To-Do:
+- GET /people/9aed8882b9f64896/stream
+- POST /receive/users/9aed8882b9f64896/
+*/
+
 require_once('include/crypto.php');
 require_once('include/items.php');
 require_once('include/bb2diaspora.php');
diff --git a/object/Item.php b/object/Item.php
index 3211048cef..75f99742eb 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -325,7 +325,7 @@ class Item extends BaseObject {
 			'body' => $body_e,
 			'text' => $text_e,
 			'id' => $this->get_id(),
-			'guid' => $item['guid'],
+			'guid' => urlencode($item['guid']),
 			'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
 			'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
 			'to' => t('to'),