diff --git a/view/templates/diaspora_like.tpl b/view/templates/diaspora_like.tpl
index 1d58d5d3f..b35ec46ad 100644
--- a/view/templates/diaspora_like.tpl
+++ b/view/templates/diaspora_like.tpl
@@ -6,11 +6,11 @@
 <XML>
   <post>
     <like>
-      <target_type>{{$target_type}}</target_type>
+      <positive>{{$positive}}</positive>
       <guid>{{$guid}}</guid>
+      <target_type>{{$target_type}}</target_type>
       <parent_guid>{{$parent_guid}}</parent_guid>
       <author_signature>{{$authorsig}}</author_signature>
-      <positive>{{$positive}}</positive>
       <diaspora_handle>{{$handle}}</diaspora_handle>
     </like>
   </post>
diff --git a/view/templates/diaspora_like_relay.tpl b/view/templates/diaspora_like_relay.tpl
index 7a55d8b20..379bf0f45 100644
--- a/view/templates/diaspora_like_relay.tpl
+++ b/view/templates/diaspora_like_relay.tpl
@@ -6,12 +6,12 @@
 <XML>
   <post>
     <like>
+      <positive>{{$positive}}</positive>
       <guid>{{$guid}}</guid>
       <target_type>{{$target_type}}</target_type>
       <parent_guid>{{$parent_guid}}</parent_guid>
       <parent_author_signature>{{$parentsig}}</parent_author_signature>
       <author_signature>{{$authorsig}}</author_signature>
-      <positive>{{$positive}}</positive>
       <diaspora_handle>{{$handle}}</diaspora_handle>
     </like>
   </post>
diff --git a/view/templates/diaspora_photo.tpl b/view/templates/diaspora_photo.tpl
index b6220346c..258a9c2f4 100644
--- a/view/templates/diaspora_photo.tpl
+++ b/view/templates/diaspora_photo.tpl
@@ -6,13 +6,13 @@
 <XML>
   <post>
     <photo>
-      <remote_photo_path>{{$path}}</remote_photo_path>
-      <remote_photo_name>{{$filename}}</remote_photo_name>
-      <status_message_guid>{{$msg_guid}}</status_message_guid>
       <guid>{{$guid}}</guid>
       <diaspora_handle>{{$handle}}</diaspora_handle>
       <public>{{$public}}</public>
       <created_at>{{$created_at}}</created_at>
+      <remote_photo_path>{{$path}}</remote_photo_path>
+      <remote_photo_name>{{$filename}}</remote_photo_name>
+      <status_message_guid>{{$msg_guid}}</status_message_guid>
     </photo>
   </post>
-</XML>
\ No newline at end of file
+</XML>
diff --git a/view/templates/diaspora_post.tpl b/view/templates/diaspora_post.tpl
index 2817f7d4a..b5a79c194 100644
--- a/view/templates/diaspora_post.tpl
+++ b/view/templates/diaspora_post.tpl
@@ -11,6 +11,7 @@
       <diaspora_handle>{{$handle}}</diaspora_handle>
       <public>{{$public}}</public>
       <created_at>{{$created}}</created_at>
+      <provider_display_name>{{$provider}}</provider_display_name>
     </status_message>
   </post>
-</XML>
\ No newline at end of file
+</XML>
diff --git a/view/templates/diaspora_profile.tpl b/view/templates/diaspora_profile.tpl
index 11aaf1055..e57b82820 100644
--- a/view/templates/diaspora_profile.tpl
+++ b/view/templates/diaspora_profile.tpl
@@ -9,13 +9,13 @@
   <first_name>{{$first}}</first_name>
   <last_name>{{$last}}</last_name>
   <image_url>{{$large}}</image_url>
-  <image_url_small>{{$small}}</image_url_small>
   <image_url_medium>{{$medium}}</image_url_medium>
+  <image_url_small>{{$small}}</image_url_small>
   <birthday>{{$dob}}</birthday>
   <gender>{{$gender}}</gender>
   <bio>{{$about}}</bio>
   <location>{{$location}}</location>
   <searchable>{{$searchable}}</searchable>
   <tag_string>{{$tags}}</tag_string>
-</profile></post>
-      </XML>
+ </profile></post>
+</XML>
diff --git a/view/templates/diaspora_relayable_retraction.tpl b/view/templates/diaspora_relayable_retraction.tpl
index 138cbdb31..c25e13db1 100644
--- a/view/templates/diaspora_relayable_retraction.tpl
+++ b/view/templates/diaspora_relayable_retraction.tpl
@@ -6,11 +6,11 @@
 <XML>
   <post>
     <relayable_retraction>
-      <target_type>{{$target_type}}</target_type>
-      <target_guid>{{$guid}}</target_guid>
       <parent_author_signature>{{$parentsig}}</parent_author_signature>
-      <target_author_signature>{{$authorsig}}</target_author_signature>
+      <target_guid>{{$guid}}</target_guid>
+      <target_type>{{$target_type}}</target_type>
       <sender_handle>{{$handle}}</sender_handle>
+      <target_author_signature>{{$authorsig}}</target_author_signature>
     </relayable_retraction>
   </post>
 </XML>
diff --git a/view/templates/diaspora_retract.tpl b/view/templates/diaspora_retract.tpl
index 103bfc9d5..345f4bcb6 100644
--- a/view/templates/diaspora_retract.tpl
+++ b/view/templates/diaspora_retract.tpl
@@ -7,8 +7,8 @@
   <post>
     <retraction>
       <post_guid>{{$guid}}</post_guid>
-      <type>{{$type}}</type>
       <diaspora_handle>{{$handle}}</diaspora_handle>
+      <type>{{$type}}</type>
     </retraction>
   </post>
-</XML>
\ No newline at end of file
+</XML>