diff --git a/actions/conversation.php b/actions/conversation.php
index 123965afa2..f33d267d35 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -123,7 +123,7 @@ class ConversationAction extends Action
      */
     function showContent()
     {
-        $tnl = new ThreadedNoticeList($this->notices, $this, $this->userProfile);
+        $tnl = new FullThreadedNoticeList($this->notices, $this, $this->userProfile);
 
         $cnt = $tnl->show();
     }
diff --git a/actions/conversationreplies.php b/actions/conversationreplies.php
index 450a3d6828..55c3efa9e0 100644
--- a/actions/conversationreplies.php
+++ b/actions/conversationreplies.php
@@ -86,19 +86,3 @@ class ConversationRepliesAction extends ConversationAction
         $this->elementEnd('html');
     }
 }
-
-class FullThreadedNoticeList extends ThreadedNoticeList
-{
-    function newListItem($notice)
-    {
-        return new FullThreadedNoticeListItem($notice, $this->out, $this->userProfile);
-    }
-}
-
-class FullThreadedNoticeListItem extends ThreadedNoticeListItem
-{
-    function initialItems()
-    {
-        return 1000; // @fixme
-    }
-}
diff --git a/lib/fullthreadednoticelist.php b/lib/fullthreadednoticelist.php
new file mode 100644
index 0000000000..52b5f279c9
--- /dev/null
+++ b/lib/fullthreadednoticelist.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * A threaded notice list that shows all notices
+ * 
+ * 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);
+}
+
+/**
+ * A threaded notice list that shows all notices
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Brion Vibber <brion@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 FullThreadedNoticeList extends ThreadedNoticeList
+{
+    function newListItem($notice)
+    {
+        return new FullThreadedNoticeListItem($notice, $this->out, $this->userProfile);
+    }
+}
+
+/**
+ * A threaded notice list item that shows everything
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Brion Vibber <brion@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 FullThreadedNoticeListItem extends ThreadedNoticeListItem
+{
+    function initialItems()
+    {
+        return 1000; // @fixme
+    }
+}