diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php
index a4d45b2122..e3ee39dc9a 100644
--- a/plugins/Activity/ActivityPlugin.php
+++ b/plugins/Activity/ActivityPlugin.php
@@ -64,6 +64,9 @@ class ActivityPlugin extends Plugin
         switch ($cls)
         {
         case 'JoinListItem':
+        case 'LeaveListItem':
+        case 'FollowListItem':
+        case 'UnfollowListItem':
             include_once $dir . '/'.strtolower($cls).'.php';
             return false;
         default:
@@ -288,6 +291,15 @@ class ActivityPlugin extends Plugin
 		case ActivityVerb::JOIN:
 			$adapter = new JoinListItem($nli);
 			break;
+		case ActivityVerb::LEAVE:
+			$adapter = new JoinListItem($nli);
+			break;
+		case ActivityVerb::FOLLOW:
+			$adapter = new FollowListItem($nli);
+			break;
+		case ActivityVerb::UNFOLLOW:
+			$adapter = new UnfollowListItem($nli);
+			break;
 		}
 
         if (!empty($adapter)) {
diff --git a/plugins/Activity/followlistitem.php b/plugins/Activity/followlistitem.php
new file mode 100644
index 0000000000..5a3721013a
--- /dev/null
+++ b/plugins/Activity/followlistitem.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Title of module
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Cache
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * NoticeListItemAdapter for join activities
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class FollowListItem extends NoticeListItemAdapter
+{
+    /**
+     * Show the join activity
+     *
+     * @return void
+     */
+    
+    function showNotice()
+    {
+        $out = $this->nli->out;
+        $out->elementStart('div', 'entry-title');
+        $this->showContent();
+        $out->elementEnd('div');
+    }
+
+    function showContent()
+    {
+        $notice = $this->nli->notice;
+        $out    = $this->nli->out;
+		
+		// FIXME: get the actual data on the leave
+		
+        $out->elementStart('div', 'follow-activity');
+
+        $out->raw($notice->rendered);
+        
+        $out->elementEnd('div');
+    } 
+}
+
diff --git a/plugins/Activity/leavelistitem.php b/plugins/Activity/leavelistitem.php
new file mode 100644
index 0000000000..2c8565e986
--- /dev/null
+++ b/plugins/Activity/leavelistitem.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Title of module
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Cache
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * NoticeListItemAdapter for join activities
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class LeaveListItem extends NoticeListItemAdapter
+{
+    /**
+     * Show the join activity
+     *
+     * @return void
+     */
+    
+    function showNotice()
+    {
+        $out = $this->nli->out;
+        $out->elementStart('div', 'entry-title');
+        $this->showContent();
+        $out->elementEnd('div');
+    }
+
+    function showContent()
+    {
+        $notice = $this->nli->notice;
+        $out    = $this->nli->out;
+		
+		// FIXME: get the actual data on the leave
+		
+        $out->elementStart('div', 'leave-activity');
+
+        $out->raw($notice->rendered);
+        
+        $out->elementEnd('div');
+    } 
+}
+
diff --git a/plugins/Activity/unfollowlistitem.php b/plugins/Activity/unfollowlistitem.php
new file mode 100644
index 0000000000..8bc464ed23
--- /dev/null
+++ b/plugins/Activity/unfollowlistitem.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Title of module
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Cache
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * NoticeListItemAdapter for join activities
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class UnfollowListItem extends NoticeListItemAdapter
+{
+    /**
+     * Show the join activity
+     *
+     * @return void
+     */
+    
+    function showNotice()
+    {
+        $out = $this->nli->out;
+        $out->elementStart('div', 'entry-title');
+        $this->showContent();
+        $out->elementEnd('div');
+    }
+
+    function showContent()
+    {
+        $notice = $this->nli->notice;
+        $out    = $this->nli->out;
+		
+		// FIXME: get the actual data on the leave
+		
+        $out->elementStart('div', 'unfollow-activity');
+
+        $out->raw($notice->rendered);
+        
+        $out->elementEnd('div');
+    } 
+}
+