diff --git a/view/templates/api_friends_xml.tpl b/view/templates/api_friends_xml.tpl
index 6520415a77..4c9f7e6287 100644
--- a/view/templates/api_friends_xml.tpl
+++ b/view/templates/api_friends_xml.tpl
@@ -1,8 +1,6 @@
-
-<!-- TEMPLATE APPEARS UNUSED -->
-
+{{* used in include/api.php 'api_statuses_friends' and 'api_statuses_followers' *}}
 <users type="array">
 	{{foreach $users as $u}}
-	{{include file="api_user_xml.tpl" user=$u}}
+	<user>{{include file="api_user_xml.tpl" user=$u}}</user>
 	{{/foreach}}
 </users>
diff --git a/view/templates/api_timeline_xml.tpl b/view/templates/api_timeline_xml.tpl
index e22c1e2ee5..2579331495 100644
--- a/view/templates/api_timeline_xml.tpl
+++ b/view/templates/api_timeline_xml.tpl
@@ -13,7 +13,9 @@
   <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
   <geo>{{$status.geo}}</geo>
   <favorited>{{$status.favorited}}</favorited>
-{{include file="api_user_xml.tpl" user=$status.user}}  <statusnet:html>{{$status.statusnet_html}}</statusnet:html>
+	<user>{{include file="api_user_xml.tpl" user=$status.user}}</user>
+	<friendica:owner>{{include file="api_user_xml.tpl" user=$status.friendica_owner}}</friendica:owner>
+  <statusnet:html>{{$status.statusnet_html}}</statusnet:html>
   <statusnet:conversation_id>{{$status.statusnet_conversation_id}}</statusnet:conversation_id>
   <url>{{$status.url}}</url>
   <coordinates>{{$status.coordinates}}</coordinates>
diff --git a/view/templates/api_user_xml.tpl b/view/templates/api_user_xml.tpl
index 7e0ec6ed63..698c5436dd 100644
--- a/view/templates/api_user_xml.tpl
+++ b/view/templates/api_user_xml.tpl
@@ -1,5 +1,5 @@
+{{* includer template MUST provide root element *}}
 
-  <user>
    <id>{{$user.id}}</id>
    <name>{{$user.name}}</name>
    <screen_name>{{$user.screen_name}}</screen_name>
@@ -44,4 +44,4 @@
     <place>{{$user.status.place}}</place>
     <contributors>{{$user.status.contributors}}</contributors>
   {{/if}}</status>
-  </user>
+