diff --git a/include/items.php b/include/items.php
index 8dc997b16..82d351b28 100644
--- a/include/items.php
+++ b/include/items.php
@@ -617,7 +617,7 @@ function get_atom_elements($feed,$item) {
 			if(! $body)
 				$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
 			// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
-			$res['object'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
+			$res['target'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
 			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
 
 				$body = html2bb_video($body);
@@ -1806,8 +1806,34 @@ function local_delivery($importer,$data) {
 				if(count($r)) {
 					$item = $r[0];
 
-					if(! $item['deleted'])
-						logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
+					if($item['deleted'])
+						continue;
+
+					logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
+
+					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+						$xo = parse_xml_string($item['object'],false);
+						$xt = parse_xml_string($item['target'],false);
+						if($xt->type === ACTIVITY_OBJ_NOTE) {
+							$i = q("select * from item where uri = '%s' and uid = %d limit 1",
+								dbesc($xt->id),
+								intval($importer['importer_uid'])
+							);
+							if(count($i)) {
+								$tags = explode(',',$i['tag']);
+								$newtags = array();
+								if(count($tags)) {
+									foreach($tags as $tag)
+										if(trim($tag) !== trim($xo->body))
+											$newtags[] = trim($tag);
+								}
+								q("update item set tag = '%s' where id = %d limit 1",
+									dbesc(implode(',',$newtags)),
+									intval($i[0]['id'])
+								);
+							}
+						}
+					}
 
 					if($item['uri'] == $item['parent-uri']) {
 						$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s'
@@ -1896,12 +1922,39 @@ function local_delivery($importer,$data) {
 				$datarray['owner-link'] = $r[0]['url'];
 				$datarray['owner-avatar'] = $r[0]['thumb'];
 				$datarray['contact-id'] = $importer['id'];
-				if(($datarray['verb'] == ACTIVITY_LIKE) || ($datarray['verb'] == ACTIVITY_DISLIKE)) {
+				if(($datarray['verb'] === ACTIVITY_LIKE) || ($datarray['verb'] === ACTIVITY_DISLIKE)) {
 					$is_like = true;
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
 					$datarray['last-child'] = 0;
 				}
+
+				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
+
+
+					$xo = parse_xml_string($datarray['object'],false);
+					$xt = parse_xml_string($datarray['target'],false);
+
+					if(($xt->type == ACTIVITY_OBJ_NOTE) && ($xt->id == $r[0]['uri'])) {
+
+						// extract tag, if not duplicate, and this user allows tags, add to parent item						
+						if($xo->content) {
+
+							if(! (stristr($r[0]['tag'],trim($xo->content)))) {
+								$i = q("SELECT `blocktags` FROM `user` where `uid` = %d LIMIT 1",
+									intval($importer['importer_uid'])
+								);
+								if(count($i) && ! ($i[0]['blocktags'])) {
+									q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
+										dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
+										intval($r[0]['id'])
+									);
+								}
+							}
+						}													
+					}
+				}
+
 				$posted_id = item_store($datarray);
 				$parent = 0;
 
@@ -2049,6 +2102,32 @@ function local_delivery($importer,$data) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
 				}
+
+				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
+
+					$xo = parse_xml_string($datarray['object'],false);
+					$xt = parse_xml_string($datarray['target'],false);
+
+					if($xt->type == ACTIVITY_OBJ_NOTE) {
+						$r = q("select * from item where `uri` = '%s' AND `uid` = %d limit 1",
+							dbesc($xt->id),
+							intval($importer['importer_uid'])
+						);
+						if(! count($r))
+							continue;				
+
+						// extract tag, if not duplicate, add to parent item						
+						if($xo->content) {
+							if(! (stristr($r[0]['tag'],trim($xo->content)))) {
+								q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
+									dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
+									intval($r[0]['id'])
+								);
+							}
+						}													
+					}
+				}
+
 				$posted_id = item_store($datarray);
 
 				// find out if our user is involved in this conversation and wants to be notified.
@@ -2723,4 +2802,4 @@ function drop_item($id,$interactive = true) {
 		//NOTREACHED
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/mod/tagger.php b/mod/tagger.php
new file mode 100644
index 000000000..c64184db7
--- /dev/null
+++ b/mod/tagger.php
@@ -0,0 +1,170 @@
+<?php
+
+require_once('include/security.php');
+require_once('include/bbcode.php');
+require_once('include/items.php');
+
+
+function tagger_content(&$a) {
+
+	if(! local_user() && ! remote_user()) {
+		return;
+	}
+
+	$term= notags(trim($_GET['term']));
+
+	if(! $term)
+		return;
+
+	$item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
+
+	logger('tagger: tag ' . $term . ' item ' . $item_id);
+
+
+	$r = q("SELECT * FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s') LIMIT 1",
+		dbesc($item_id),
+		dbesc($item_id)
+	);
+
+	if(! $item_id || (! count($r))) {
+		logger('tagger: no item ' . $item_id);
+		return;
+	}
+
+	$item = $r[0];
+
+	$owner_uid = $item['uid'];
+
+	$r = q("select `nickname` from user where uid = %d limit 1",
+		intval($owner_uid)
+	);
+	if(count($r))
+		$owner_nick = $r[0]['nickname'];
+
+
+//	if(local_user() != $owner_uid)
+//		return;
+
+	if(remote_user()) {
+		$r = q("select * from contact where id = %d AND `uid` = %d limit 1",
+			intval(remote_user()),
+			intval($item['uid'])
+		);
+	}
+	else {
+		$r = q("select * from contact where self = 1 and uid = %d limit 1",
+			intval(local_user())
+		);
+	}
+	if(count($r))
+			$contact = $r[0];
+	else {
+		logger('tagger: no contact_id');
+		return;
+	}
+
+	$uri = item_new_uri($a->get_hostname(),$owner_uid);
+
+	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
+	$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); 
+
+	$link = xmlify('<link rel="alternate" type="text/html" href="' 
+		. $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
+
+	$body = $item['body'];
+
+	$target = <<< EOT
+	<target>
+		<type>$targettype</type>
+		<local>1</local>
+		<id>{$item['uri']}</id>
+		<link>$link</link>
+		<title></title>
+		<content>$body</content>
+	</target>
+EOT;
+
+	$tagid = $a->get_baseurl() . '/search?search=' . $term;
+	$objtype = ACTIVITY_OBJ_TAGTERM;
+
+	$obj = <<< EOT
+	<object>
+		<type>$objtype</type>
+		<local>1</local>
+		<id>$tagid</id>
+		<link>$tagid</link>
+		<title>$term</title>
+		<content>$term</content>
+	</object>
+EOT;
+
+	$bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s');
+
+	if(! isset($bodyverb))
+			return; 
+
+	$termlink = '#[url=' . $a->get_baseurl() . '/search?search=' . urlencode($term) . ']'. $term . '[/url]';
+
+	$arr = array();
+
+	$arr['uri'] = $uri;
+	$arr['uid'] = $owner_uid;
+	$arr['contact-id'] = $contact['id'];
+	$arr['type'] = 'activity';
+	$arr['wall'] = $item['wall'];
+	$arr['gravity'] = GRAVITY_COMMENT;
+	$arr['parent'] = $item['id'];
+	$arr['parent-uri'] = $item['uri'];
+	$arr['owner-name'] = $item['author-name'];
+	$arr['owner-link'] = $item['author-link'];
+	$arr['owner-avatar'] = $item['author-avatar'];
+	$arr['author-name'] = $contact['name'];
+	$arr['author-link'] = $contact['url'];
+	$arr['author-avatar'] = $contact['thumb'];
+	
+	$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
+	$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
+	$plink = '[url=' . $item['plink'] . ']' . $post_type . '[/url]';
+	$arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink, $termlink );
+
+	$arr['verb'] = ACTIVITY_TAG;
+	$arr['target-type'] = $targettype;
+	$arr['target'] = $target;
+	$arr['object-type'] = $objtype;
+	$arr['object'] = $obj;
+	$arr['allow_cid'] = $item['allow_cid'];
+	$arr['allow_gid'] = $item['allow_gid'];
+	$arr['deny_cid'] = $item['deny_cid'];
+	$arr['deny_gid'] = $item['deny_gid'];
+	$arr['visible'] = 1;
+	$arr['unseen'] = 1;
+	$arr['last-child'] = 1;
+	$arr['origin'] = 1;
+
+	$post_id = item_store($arr);	
+
+	q("UPDATE `item` set plink = '%s' where id = %d limit 1",
+		dbesc($a->get_baseurl() . '/display/' . $owner_nick . '/' . $post_id),
+		intval($post_id)
+	);
+		
+
+	if(! $item['visible']) {
+		$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			intval($item['id']),
+			intval($owner_uid)
+		);
+	}			
+
+
+
+	$arr['id'] = $post_id;
+
+	call_hooks('post_local_end', $arr);
+
+	proc_run('php',"include/notifier.php","like","$post_id");
+
+	return; // NOTREACHED
+
+
+}
\ No newline at end of file