diff --git a/boot.php b/boot.php
index 9ff17b466..3d1d884e3 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once("include/pgettext.php");
 
 define ( 'FRIENDIKA_VERSION',      '2.2.1061' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1076      );
+define ( 'DB_UPDATE_VERSION',      1077      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --git a/database.sql b/database.sql
index 50697845a..9c43df3db 100644
--- a/database.sql
+++ b/database.sql
@@ -573,3 +573,9 @@ CREATE TABLE IF NOT EXISTS `attach` (
 `deny_gid` MEDIUMTEXT NOT NULL
 ) ENGINE = MYISAM DEFAULT CHARSET=utf8;
 
+CREATE TABLE IF NOT EXISTS `guid` (
+`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`guid` CHAR( 16 ) NOT NULL ,
+INDEX ( `guid` )
+) ENGINE = MYISAM  DEFAULT CHARSET=utf8;
+
diff --git a/update.php b/update.php
index 9c55f15cf..4ef362b19 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1076 );
+define( 'UPDATE_VERSION' , 1077 );
 
 /**
  *
@@ -623,4 +623,11 @@ function update_1075() {
 			);
 		}
 	}
-}
\ No newline at end of file
+}
+
+function update_1076() {
+	q("CREATE TABLE ``guid` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+		`guid` CHAR( 16 ) NOT NULL , INDEX ( `guid` ) ) ENGINE = MYISAM ");
+
+}
+
diff --git a/view/diaspora_comment.tpl b/view/diaspora_comment.tpl
new file mode 100644
index 000000000..6ef4ab664
--- /dev/null
+++ b/view/diaspora_comment.tpl
@@ -0,0 +1,11 @@
+<XML>
+  <post>
+    <comment>
+      <guid>$guid</guid>
+      <parent_guid>$parent_guid</parent_guid>
+      <author_signature>$authorsig</author_signature>
+      <text>$body</text>
+      <diaspora_handle>$handle</diaspora_handle>
+    </comment>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/diaspora_comment_relay.tpl b/view/diaspora_comment_relay.tpl
new file mode 100644
index 000000000..e82de1171
--- /dev/null
+++ b/view/diaspora_comment_relay.tpl
@@ -0,0 +1,12 @@
+<XML>
+  <post>
+    <comment>
+      <guid>$guid</guid>
+      <parent_guid>$parent_guid</parent_guid>
+      <parent_author_signature>$parentsig</parent_author_signature>
+      <author_signature>$authorsig</author_signature>
+      <text>$body</text>
+      <diaspora_handle>$handle</diaspora_handle>
+    </comment>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/diaspora_like.tpl b/view/diaspora_like.tpl
new file mode 100644
index 000000000..76356eb29
--- /dev/null
+++ b/view/diaspora_like.tpl
@@ -0,0 +1,12 @@
+<XML>
+  <post>
+    <like>
+      <target_type>$type</target_type>
+      <guid>$guid</guid>
+      <parent_guid>$parent_guid</parent_guid>
+      <author_signature>$authorsig</author_signature>
+      <positive>$positive</positive>
+      <diaspora_handle>$handle</diaspora_handle>
+    </like>
+  </post>
+</XML>
diff --git a/view/diaspora_like_relay.tpl b/view/diaspora_like_relay.tpl
new file mode 100644
index 000000000..6feba96ad
--- /dev/null
+++ b/view/diaspora_like_relay.tpl
@@ -0,0 +1,13 @@
+<XML>
+  <post>
+    <like>
+      <guid>$guid</guid>
+      <target_type>$type</target_type>
+      <parent_guid>$parent_guid</parent_guid>
+      <parent_author_signature>$parentsig</parent_author_signature>
+      <author_signature>$authrosig</author_signature>
+      <positive>$positive</positive>
+      <diaspora_handle>$handle</diaspora_handle>
+    </like>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/diaspora_post.tpl b/view/diaspora_post.tpl
new file mode 100644
index 000000000..1ba3ebb1f
--- /dev/null
+++ b/view/diaspora_post.tpl
@@ -0,0 +1,11 @@
+<XML>
+  <post>
+    <status_message>
+      <raw_message>$body</raw_message>
+      <guid>$guid</guid>
+      <diaspora_handle>$handle</diaspora_handle>
+      <public>$public</public>
+      <created_at>$created</created_at>
+    </status_message>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/diaspora_retract.tpl b/view/diaspora_retract.tpl
new file mode 100644
index 000000000..6d5b6e22b
--- /dev/null
+++ b/view/diaspora_retract.tpl
@@ -0,0 +1,9 @@
+<XML>
+  <post>
+    <retraction>
+      <post_guid>$guid</post_guid>
+      <type>$type</type>
+      <diaspora_handle>$handle</diaspora_handle>
+    </retraction>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/diaspora_share.tpl b/view/diaspora_share.tpl
new file mode 100644
index 000000000..c16341b1e
--- /dev/null
+++ b/view/diaspora_share.tpl
@@ -0,0 +1,8 @@
+<XML>
+  <post>
+    <request>
+      <sender_handle>$sender</sender_handle>
+      <recipient_handle>$recipient</recipient_handle>
+    </request>
+  </post>
+</XML>
\ No newline at end of file