diff --git a/boot.php b/boot.php
index 67e3d65a..cddba996 100644
--- a/boot.php
+++ b/boot.php
@@ -288,7 +288,7 @@ class App {
 		$this->argv = explode('/',$this->cmd);
 		$this->argc = count($this->argv);
 		if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
-			$this->module = $this->argv[0];
+			$this->module = str_replace(".", "_", $this->argv[0]);
 		}
 		else {
 			$this->module = 'home';
diff --git a/include/api.php b/include/api.php
new file mode 100644
index 00000000..82790a63
--- /dev/null
+++ b/include/api.php
@@ -0,0 +1,431 @@
+<?php
+	require_once("bbcode.php");
+	require_once("datetime.php");
+	
+	/* 
+	 * Twitter-Like API
+	 *  
+	 */
+
+	$API = Array();
+	 
+
+	
+	function api_date($str){
+		//Wed May 23 06:01:13 +0000 2007
+		return datetime_convert('UTC', 'UTC', $str, "D M d h:i:s +0000 Y" );
+	}
+	 
+	
+	function api_register_func($path, $func, $auth=false){
+		global $API;
+		$API[$path] = array('func'=>$func,
+							'auth'=>$auth);
+	}
+	
+	/**
+	 * Simple HTTP Login
+	 */
+	function api_login(&$a){
+		if (!isset($_SERVER['PHP_AUTH_USER'])) {
+		    header('WWW-Authenticate: Basic realm="Friendika"');
+		    header('HTTP/1.0 401 Unauthorized');
+		    die('This api require login');
+		}
+		
+		$user = $_SERVER['PHP_AUTH_USER'];
+		$encrypted = hash('whirlpool',trim($_SERVER['PHP_AUTH_PW']));
+    		
+		
+			/**
+			 *  next code from mod/auth.php. needs better solution
+			 */
+			
+		// process normal login request
+
+		$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
+			AND `password` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
+			dbesc(trim($user)),
+			dbesc(trim($user)),
+			dbesc($encrypted)
+		);
+		if(count($r)){
+			$record = $r[0];
+		} else {
+		    header('WWW-Authenticate: Basic realm="Friendika"');
+		    header('HTTP/1.0 401 Unauthorized');
+		    die('This api require login');
+		}
+		$_SESSION['uid'] = $record['uid'];
+		$_SESSION['theme'] = $record['theme'];
+		$_SESSION['authenticated'] = 1;
+		$_SESSION['page_flags'] = $record['page-flags'];
+		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
+		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
+
+		//notice( t("Welcome back ") . $record['username'] . EOL);
+		$a->user = $record;
+
+		if(strlen($a->user['timezone'])) {
+			date_default_timezone_set($a->user['timezone']);
+			$a->timezone = $a->user['timezone'];
+		}
+
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
+			intval($_SESSION['uid']));
+		if(count($r)) {
+			$a->contact = $r[0];
+			$a->cid = $r[0]['id'];
+			$_SESSION['cid'] = $a->cid;
+		}
+		q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
+			dbesc(datetime_convert()),
+			intval($_SESSION['uid'])
+		);
+
+		call_hooks('logged_in', $a->user);
+
+		header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
+	}
+	
+	/**************************
+	 *  MAIN API ENTRY POINT  *
+	 **************************/
+	function api_call(&$a){
+		GLOBAL $API;
+		foreach ($API as $p=>$info){
+			if (strpos($a->query_string, $p)===0){
+				#unset($_SERVER['PHP_AUTH_USER']);
+				if ($info['auth']===true && local_user()===false) {
+						api_login($a);
+				}
+		
+				$type="json";		
+				if (strpos($a->query_string, ".xml")>0) $type="xml";
+				if (strpos($a->query_string, ".json")>0) $type="json";
+				if (strpos($a->query_string, ".rss")>0) $type="rss";
+				if (strpos($a->query_string, ".atom")>0) $type="atom";				
+				
+				$r = call_user_func($info['func'], $a, $type);
+				if ($r===false) return;
+
+				switch($type){
+					case "xml":
+						$r = mb_convert_encoding($r, "UTF-8",mb_detect_encoding($r));
+						header ("Content-Type: text/xml");
+						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
+						break;
+					case "json": 
+						header ("Content-Type: application/json");  
+						return json_encode($r);
+						break;
+					case "rss":
+						header ("Content-Type: application/rss+xml");
+						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
+						break;
+					case "atom":
+						#header ("Content-Type: application/atom+xml");
+						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
+						break;
+						
+				}
+				//echo "<pre>"; var_dump($r); die();
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * RSS extra info
+	 */
+	function api_rss_extra(&$a, $arr, $user_info){
+		if (is_null($user_info)) $user_info = api_get_user($a);
+		$arr['$rss'] = array(
+			'alternate' => $user_info['url'],
+			'self' => $a->get_baseurl(). "/". $a->query_string,
+			'updated' => api_date(null),
+			'language' => $user_info['language'],
+			'logo'	=> $a->get_baseurl()."/images/friendika-32.png",
+		);
+		
+		return $arr;
+	}
+	 
+	/**
+	 * Returns user info array.
+	 */
+	function api_get_user(&$a){
+		$user = null;
+		$extra_query = "";
+		if(x($_GET, 'user_id')) {
+			$user = intval($_GET['user_id']);	
+			$extra_query = "AND `contact`.`id` = %d ";
+		}
+		if(x($_GET, 'screen_name')) {
+			$user = dbesc($_GET['screen_name']);	
+			$extra_query = "AND `contact`.`nick` = '%s' ";
+		}
+		
+		if ($user===null){
+			list($user, $null) = explode(".",$a->argv[3]);
+			if(is_numeric($user)){
+				$user = intval($user);
+				$extra_query = "AND `contact`.`id` = %d ";
+			} else {
+				$user = dbesc($user);
+				$extra_query = "AND `contact`.`nick` = '%s' ";
+			}
+		}
+		
+		if ($user==='') {
+			if (local_user()===false) {
+				api_login($a); return False;
+			} else {
+				$user = $_SESSION['uid'];
+				$extra_query = "AND `user`.`uid` = %d ";
+			}
+			
+		}
+		
+
+		// user info		
+		$uinfo = q("SELECT *, `contact`.`id` as `cid` FROM `user`, `contact`
+				WHERE `user`.`uid`=`contact`.`uid` AND `contact`.`self`=1
+				$extra_query",
+				$user
+		);
+		if (count($uinfo)==0) {
+			return False;
+		}
+		
+		// count public wall messages
+		$r = q("SELECT COUNT(`id`) as `count` FROM `item`
+				WHERE  `uid` = %d
+				AND `type`='wall' 
+				AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+				intval($uinfo[0]['uid'])
+		);
+		$countitms = $r[0]['count'];
+		
+		// count friends
+		$r = q("SELECT COUNT(`id`) as `count` FROM `contact`
+				WHERE  `uid` = %d
+				AND `self`=0 AND `blocked`=0", 
+				intval($uinfo[0]['uid'])
+		);
+		$countfriends = $r[0]['count'];
+				
+
+		$ret = Array(
+			'id' => $uinfo[0]['cid'],
+			'name' => $uinfo[0]['username'],
+			'screen_name' => $uinfo[0]['nickname'],
+			'location' => $uinfo[0]['default-location'],
+			'profile_image_url' => $uinfo[0]['micro'],
+			'url' => $uinfo[0]['url'],
+			'protected' => false,	#
+			'friends_count' => $countfriends,
+			'created_at' => api_date($uinfo[0]['created']),
+			'utc_offset' => 0, #XXX: fix me
+			'time_zone' => $uinfo[0]['timezone'],
+			'geo_enabled' => false,
+			'statuses_count' => $countitms, #XXX: fix me 
+			'lang' => 'en', #XXX: fix me
+			'description' => '',
+			'followers_count' => $countfriends, #XXX: fix me
+			'lang' => 'en', #XXX: fix me
+			'favourites_count' => 0,
+			'contributors_enabled' => false,
+			'follow_request_sent' => false,
+			'profile_background_color' => 'cfe8f6',
+			'profile_text_color' => '000000',
+			'profile_link_color' => 'FF8500',
+			'profile_sidebar_fill_color' =>'AD0066',
+			'profile_sidebar_border_color' => 'AD0066',
+			'profile_background_image_url' => '',
+			'profile_background_tile' => false,
+			'profile_use_background_image' => false,
+			'notifications' => false,
+			'verified' => true, #XXX: fix me
+			'followers' => '', #XXX: fix me
+			#'status' => null
+		);
+	
+		return $ret;
+		
+	}
+
+	/**
+	 * apply xmlify() to all values of array $val, recursively
+	 */
+	function api_xmlify($val){
+		if (is_bool($val)) return $val?"true":"false";
+		if (is_array($val)) return array_map('api_xmlify', $val);
+		return xmlify($val);
+	}
+
+	/**
+	 *  load api $templatename for $type and replace $data array
+	 */
+	function api_apply_template($templatename, $type, $data){
+		switch($type){
+			case "rss":
+			case "atom":
+			case "xml":
+				$data = api_xmlify($data);
+				$tpl = load_view_file("view/api_".$templatename."_".$type.".tpl");
+				$ret = replace_macros($tpl, $data);
+				break;
+			case "json":
+				$ret = $data;
+				break;
+		}
+		return $ret;
+	}
+	
+	/**
+	 ** TWITTER API
+	 */
+	
+	/**
+	 * Returns an HTTP 200 OK response code and a representation of the requesting user if authentication was successful; 
+	 * returns a 401 status code and an error message if not. 
+	 * http://developer.twitter.com/doc/get/account/verify_credentials
+	 */
+	function api_account_verify_credentials(&$a, $type){
+		if (local_user()===false) return false;
+		$user_info = api_get_user($a);
+		
+		return api_apply_template("user", $type, array('$user' => $user_info));
+
+	}
+	api_register_func('api/account/verify_credentials','api_account_verify_credentials', true);
+	 	
+	
+		
+	/**
+	 * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
+	 * The author's most recent status will be returned inline.
+	 * http://developer.twitter.com/doc/get/users/show
+	 */
+	function api_users_show(&$a, $type){
+		$user_info = api_get_user($a);
+		// get last public wall message
+		$lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `i`.`nick` as `reply_author`
+				FROM `item`, `contact`,
+					(SELECT `item`.`id`, `item`.`contact-id`, `contact`.`nick` FROM `item`,`contact` WHERE `contact`.`id`=`item`.`contact-id`) as `i` 
+				WHERE `item`.`contact-id` = %d
+					AND `i`.`id` = `item`.`parent`
+					AND `contact`.`id`=`item`.`contact-id` AND `contact`.`self`=1
+					AND `type`!='activity'
+					AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
+				ORDER BY `created` DESC 
+				LIMIT 1",
+				intval($user_info['id'])
+		);
+
+		if (count($lastwall)>0){
+			$lastwall = $lastwall[0];
+			
+			$in_reply_to_status_id = '';
+			$in_reply_to_user_id = '';
+			$in_reply_to_screen_name = '';
+			if ($lastwall['parent']!=$lastwall['id']) {
+				$in_reply_to_status_id=$lastwall['parent'];
+				$in_reply_to_user_id = $lastwall['reply_uid'];
+				$in_reply_to_screen_name = $lastwall['reply_author'];
+			}  
+			$user_info['status'] = array(
+				'created_at' => api_date($lastwall['created']),
+				'id' => $lastwall['contact-id'],
+				'text' => strip_tags(bbcode($lastwall['body'])),
+				'source' => 'web',
+				'truncated' => false,
+				'in_reply_to_status_id' => $in_reply_to_status_id,
+				'in_reply_to_user_id' => $in_reply_to_user_id,
+				'favorited' => false,
+				'in_reply_to_screen_name' => $in_reply_to_screen_name,
+				'geo' => '',
+				'coordinates' => $lastwall['coord'],
+				'place' => $lastwall['location'],
+				'contributors' => ''					
+			);
+		}
+		return  api_apply_template("user", $type, array('$user' => $user_info));
+		
+	}
+	api_register_func('api/users/show','api_users_show');
+	
+	/**
+	 * 
+	 * http://developer.twitter.com/doc/get/statuses/home_timeline
+	 * 
+	 * TODO: Optional parameters
+	 * TODO: Add reply info
+	 */
+	function api_statuses_home_timeline(&$a, $type){
+		if (local_user()===false) return false;
+		
+		$user_info = api_get_user($a);
+		
+		// get last newtork messages
+		$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` ) ";
+
+		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+			FROM `item`, `contact`, `user`
+			WHERE `item`.`contact-id` = %d AND `user`.`uid` = `item`.`uid` 
+			AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			AND `contact`.`id` = `item`.`contact-id`
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra
+			ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
+			intval($user_info['id']),
+			0,20
+		);
+		$ret = Array();
+
+		foreach($r as $item) {
+			$status = array(
+				'created_at'=> api_date($item['created']),
+				'id'		=> $item['id'],
+				'text'		=> strip_tags(bbcode($item['body'])),
+				'html'		=> bbcode($item['body']),
+				'source'	=> 'web',
+				'url'		=> ($item['plink']!=''?$item['plink']:$item['author-link']),
+				'truncated' => False,
+				'in_reply_to_status_id' => ($item['parent']!=$item['id']?$item['id']:''),
+				'in_reply_to_user_id' => '',
+				'favorited' => false,
+				'in_reply_to_screen_name' => '',
+				'geo' => '',
+				'coordinates' => $item['coord'],
+				'place' => $item['location'],
+				'contributors' => '',
+				'annotations'  => '',
+				'entities'  => '',
+				'user' =>  $user_info,
+				'objecttype' => $item['object-type'],
+				'verb' => $item['verb'],
+				'self' => $a->get_baseurl()."/api/statuses/show/".$ite['id'].".".$type,
+				'edit' => $a->get_baseurl()."/api/statuses/show/".$ite['id'].".".$type,				
+			);
+			$ret[]=$status;
+		};
+		
+		$data = array('$statuses' => $ret);
+		switch($type){
+			case "atom":
+			case "rss":
+				$data = api_rss_extra($a, $data, $user_info);
+		}
+				
+		return  api_apply_template("timeline", $type, $data);
+	}
+	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
+	api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
+	api_register_func('api/statuses/user_timeline','api_statuses_home_timeline', true);
+	# TODO: user_timeline should be profile view
+	
diff --git a/include/template_processor.php b/include/template_processor.php
index f6d0264d..d1ff3998 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -1,11 +1,12 @@
 <?php
-	
 
 	class Template {
-		var $s;
 		var $r;
 		var $search;
 		var $replace;
+		var $stack = array();
+		var $nodes = array();
+		var $done = false;
 		
 		private function _build_replace($r, $prefix){
 	
@@ -20,31 +21,117 @@
 			}
 		} 
 		
-		private function _replcb_if($m){
-			//echo "<pre>"; var_dump($m);
-			$keys = explode(".",$m[1]);
+		private function _push_stack(){
+			$this->stack[] = array($this->r, $this->search, $this->replace, $this->nodes);
+		}
+		private function _pop_stack(){
+			list($this->r, $this->search, $this->replace, $this->nodes) = array_pop($this->stack);
+		}
+		
+		private function _get_var($name){
+			$keys = array_map('trim',explode(".",$name));			
 			$val = $this->r;
 			foreach($keys as $k) {
 				$val = $val[$k];
 			}
+			return $val;
+		}
+		
+		/**
+		 * IF node
+		 * 
+		 * {{ if <$var> }}...{{ endif }}
+		 */
+		private function _replcb_if($args){
+			$val = $this->_get_var($args[2]);
+			return ($val?$args[3]:"");
+		}
+		
+		/**
+		 * FOR node
+		 * 
+		 * {{ for <$var> as $name }}...{{ endfor }}
+		 * {{ for <$var> as $key=>$name }}...{{ endfor }}
+		 */
+		private function _replcb_for($args){
+			$m = array_map('trim', explode(" as ", $args[2]));
+			list($keyname, $varname) = explode("=>",$m[1]);
+			if (is_null($varname)) { $varname=$keyname; $keyname=""; }
+			if ($m[0]=="" || $varname=="" || is_null($varname)) die("template error: 'for ".$m[0]." as ".$varname."'") ;
+			$vals = $this->r[$m[0]];
+			$ret="";
+			if (!is_array($vals)) return $ret; 
+			foreach ($vals as $k=>$v){
+				$this->_push_stack();
+				$r = $this->r;
+				$r[$varname] = $v;
+				if ($keyname!='') $r[$keyname] = $k;
+				$ret .=  $this->replace($args[3], $r);
+				$this->_pop_stack();
+			}
+			return $ret;
+		}
+
+		/**
+		 * INC node
+		 * 
+		 * {{ inc <templatefile> [with $var1=$var2] }}{{ endinc }}
+		 */
+		private function _replcb_inc($args){
+			list($tplfile, $newctx) = array_map('trim', explode("with",$args[2]));
+			$this->_push_stack();
+			$r = $this->r;
+			if (!is_null($newctx)) {
+				list($a,$b) = array_map('trim', explode("=",$newctx));
+				$r[$a] = $this->_get_var($b); 
+			}
+			$this->nodes = Array();
+			$tpl = load_view_file($tplfile);
+			$ret = $this->replace($tpl, $r);
+			$this->_pop_stack();
+			return $ret;
 			
-			//echo $val;
-			return ($val?$m[2]:"");
+		}
+
+		private function _replcb_node($m) {
+			$node = $this->nodes[$m[1]];
+			if (method_exists($this, "_replcb_".$node[1])){
+				return call_user_func(array($this, "_replcb_".$node[1]),  $node);
+			} else {
+				return "";
+			}
+		}
+						
+		private function _replcb($m){
+			$this->done = false;	
+			$this->nodes[] = (array) $m;
+			return "||". (count($this->nodes)-1) ."||";
+		}
+		
+		private function _build_nodes($s){
+			$this->done = false;
+			while (!$this->done){
+				$this->done=true;
+				$s = preg_replace_callback('|{{ *([a-z]*) *([^}]*)}}([^{]*){{ *end\1 *}}|', array($this, "_replcb"), $s);
+			}
+			krsort($this->nodes);
+			return $s;
 		}
 		
 		public function replace($s, $r) {
-			$this->s = $s;
 			$this->r = $r;
 			$this->search = array();
 			$this->replace = array();
 	
 			$this->_build_replace($r, "");
-	
 			
-			$s = preg_replace_callback("|{{ *if *([^ }]*) *}}([^{]*){{ *endif *}}|", array($this, "_replcb_if"), $s);
+			#$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s);
+			$s = $this->_build_nodes($s);
+			$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
+			$s = str_replace($this->search,$this->replace,$s);
 			
-			return str_replace($this->search,$this->replace,$s);
+			return $s;
 		}
-		
-	}	
+	}
+	
 	$t = new Template;
diff --git a/mod/api.php b/mod/api.php
new file mode 100644
index 00000000..fa5e43de
--- /dev/null
+++ b/mod/api.php
@@ -0,0 +1,11 @@
+<?php
+
+require_once('include/api.php');
+
+function api_content(&$a) {
+	echo api_call($a);
+	killme();
+}
+
+
+
diff --git a/mod/rsd_xml.php b/mod/rsd_xml.php
new file mode 100644
index 00000000..5bf4663f
--- /dev/null
+++ b/mod/rsd_xml.php
@@ -0,0 +1,24 @@
+<?php
+
+
+
+function rsd_xml_content(&$a) {
+	header ("Content-Type: text/xml");
+	echo '<?xml version="1.0" encoding="UTF-8"?>
+ <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
+   <service>
+     <engineName>Friendika</engineName>
+     <engineLink>http://friendika.com/</engineLink>
+     <apis>
+       <api name="Twitter" preferred="true" apiLink="'.$a->get_baseurl().'/api/" blogID="">
+         <settings>
+           <docs>http://status.net/wiki/TwitterCompatibleAPI</docs>
+           <setting name="OAuth">false</setting>
+         </settings>
+       </api>
+     </apis>
+   </service>
+ </rsd>
+	';
+die();
+}
\ No newline at end of file
diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl
new file mode 100644
index 00000000..069ff765
--- /dev/null
+++ b/view/api_timeline_atom.tpl
@@ -0,0 +1,39 @@
+<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
+ <generator uri="http://status.net" version="0.9.7">StatusNet</generator>
+ <id>tag:friendika:PublicTimeline</id>
+ <title>Network on Friendika</title>
+ <subtitle>Your network updates on Friendika</subtitle>
+ <logo>$rss.logo</logo>
+ <updated>$rss.updated</updated>
+ <link type="text/html" rel="alternate" href="$rss.alternate"/>
+ <link type="application/atom+xml" rel="self" href="$rss.self"/>
+  	{{ for $statuses as $status }}
+	<entry>
+	 <activity:object-type>$status.objecttype</activity:object-type>
+	 <id>$status.id</id>
+	 <title>$status.text</title>
+	 <content type="html">$status.html</content>
+	 <link rel="alternate" type="text/html" href="$status.url"/>
+	 <activity:verb>$status.verb</activity:verb>
+	 <published>$status.created_at</published>
+	 <updated>$status.created_at</updated>
+
+	 <link rel="ostatus:conversation" href="$status.url"/>
+	 <!--
+	 <source>
+	  <id>http://identi.ca/api/statuses/user_timeline/397830.atom</id>
+	  <title>Sin Mobopolitan</title>
+	  <link rel="alternate" type="text/html" href="http://identi.ca/mobopolitan"/>
+	  <link rel="self" type="application/atom+xml" href="http://identi.ca/api/statuses/user_timeline/397830.atom"/>
+	  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/"/>
+	  <icon>http://avatar.identi.ca/397830-96-20110312195623.jpeg</icon>
+	  <updated>2011-04-21T18:39:32+00:00</updated>
+	 </source>
+	 -->
+	 <link rel="self" type="application/atom+xml" href="$status.self"/>
+	 <link rel="edit" type="application/atom+xml" href="$status.edit"/>
+	 <statusnet:notice_info local_id="$status.id" source="$status.source" favorite="false" repeated="false">
+	 </statusnet:notice_info>
+	</entry>    
+    {{ endfor }}
+</feed>
diff --git a/view/api_timeline_rss.tpl b/view/api_timeline_rss.tpl
new file mode 100644
index 00000000..fbba93ee
--- /dev/null
+++ b/view/api_timeline_rss.tpl
@@ -0,0 +1,21 @@
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com">
+  <channel>
+    <title>Friendika</title>
+    <link>$rss.alternate</link>
+    <atom:link type="application/rss+xml" rel="self" href="$rss.self"/>
+    <description>Friendika timeline</description>
+    <language>$rss.language</language>
+    <ttl>40</ttl>
+
+{{ for $statuses as $status }}
+  <item>
+    <title>$status.text</title>
+    <description>$status.text</description>
+    <pubDate>$status.created_at</pubDate>
+    <guid>$status.url</guid>
+    <link>$status.url</link>
+    <twitter:source>$status.source</twitter:source>
+  </item>
+{{ endfor }}
+  </channel>
+</rss>
diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl
new file mode 100644
index 00000000..85f73064
--- /dev/null
+++ b/view/api_timeline_xml.tpl
@@ -0,0 +1,21 @@
+<statuses type="array">
+  {{ for $statuses as $status }}
+  <status>
+    <created_at>$status.created_at</created_at>
+    <id>$status.id</id>
+    <text>$status.text</text>
+    <source>$status.source</source>
+    <truncated>$status.truncated</truncated>
+    <url>$status.url</url>
+    <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
+    <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
+    <favorited>$status.favorited</favorited>
+    <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
+    <geo>$status.geo</geo>
+    <coordinates>$status.coordinates</coordinates>
+    <place>$status.place</place>
+    <contributors>$status.contributors</contributors>
+  	{{ inc view/api_user_xml.tpl with $user=$status.user }}{{ endinc }}
+  </status>
+  {{ endfor }}
+</statuses>
\ No newline at end of file
diff --git a/view/api_user_xml.tpl b/view/api_user_xml.tpl
new file mode 100644
index 00000000..15517fc4
--- /dev/null
+++ b/view/api_user_xml.tpl
@@ -0,0 +1,46 @@
+<user>
+  <id>$user.id</id>
+  <name>$user.name</name>
+  <screen_name>$user.screen_name</screen_name>
+  <location>$user.location</location>
+  <description>$user.description</description>
+  <profile_image_url>$user.profile_image_url</profile_image_url>
+  <url>$user.url</url>
+  <protected>$user.protected</protected>
+  <followers_count>$user.followers</followers_count>
+  <profile_background_color>$user.profile_background_color</profile_background_color>
+  <profile_text_color>$user.profile_text_color</profile_text_color>
+  <profile_link_color>$user.profile_link_color</profile_link_color>
+  <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
+  <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
+  <friends_count>$user.friends_count</friends_count>
+  <created_at>$user.created_at</created_at>
+  <favourites_count>$user.favourites_count</favourites_count>
+  <utc_offset>$user.utc_offset</utc_offset>
+  <time_zone>$user.time_zone</time_zone>
+  <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
+  <profile_background_tile>$user.profile_background_tile</profile_background_tile>
+  <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
+  <notifications></notifications>
+  <geo_enabled>$user.geo_enabled</geo_enabled>
+  <verified>$user.verified</verified>
+  <following></following>
+  <statuses_count>$user.statuses_count</statuses_count>
+  <lang>$user.lang</lang>
+  <contributors_enabled>$user.contributors_enabled</contributors_enabled>
+  <status>{{ if $user.status }}
+    <created_at>$user.status.created_at</created_at>
+    <id>$user.status.id</id>
+    <text>$user.status.text</text>
+    <source>$user.status.source</source>
+    <truncated>$user.status.truncated</truncated>
+    <in_reply_to_status_id>$user.status.in_reply_to_status_id</in_reply_to_status_id>
+    <in_reply_to_user_id>$user.status.in_reply_to_user_id</in_reply_to_user_id>
+    <favorited>$user.status.favorited</favorited>
+    <in_reply_to_screen_name>$user.status.in_reply_to_screen_name</in_reply_to_screen_name>
+    <geo>$user.status.geo</geo>
+    <coordinates>$user.status.coordinates</coordinates>
+    <place>$user.status.place</place>
+    <contributors>$user.status.contributors</contributors>
+  {{ endif }}</status>
+</user>
\ No newline at end of file