diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 7a87a144f7..604428cf35 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * User profile page
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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.
@@ -15,57 +18,152 @@
  *
  * 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  Personal
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/subsgroupnav.php';
+
+/**
+ * User profile page
+ *
+ * When I created this page, "show stream" seemed like the best name for it.
+ * Now, it seems like a really bad name.
+ *
+ * It shows a stream of the user's posts, plus lots of profile info, links
+ * to subscriptions and stuff, etc.
+ *
+ * @category Personal
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
  */
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once(INSTALLDIR.'/lib/gallery.php');
-
-class SubscriptionsAction extends GalleryAction
+class SubscriptionsAction extends Action
 {
+    var $profile = null;
+    var $user = null;
+    var $page = null;
 
-    function gallery_type()
+    function prepare($args)
     {
-        return _('Subscriptions');
+        parent::prepare($args);
+
+        // FIXME very similar code below
+
+        $nickname_arg = $this->arg('nickname');
+        $nickname = common_canonical_nickname($nickname_arg);
+
+        // Permanent redirect on non-canonical nickname
+
+        if ($nickname_arg != $nickname) {
+            $args = array('nickname' => $nickname);
+            if ($this->arg('page') && $this->arg('page') != 1) {
+                $args['page'] = $this->arg['page'];
+            }
+            common_redirect(common_local_url('subscriptions', $args), 301);
+            return false;
+        }
+
+        $this->user = User::staticGet('nickname', $nickname);
+
+        if (!$this->user) {
+            $this->clientError(_('No such user.'), 404);
+            return false;
+        }
+
+        $this->profile = $this->user->getProfile();
+
+        if (!$this->profile) {
+            $this->serverError(_('User has no profile.'));
+            return false;
+        }
+
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+        return true;
     }
 
-    function get_instructions(&$profile)
+    function isReadOnly()
     {
-        $user =& common_current_user();
-        if ($user && ($user->id == $profile->id)) {
-            return _('These are the people whose notices you listen to.');
+        return true;
+    }
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showPage();
+    }
+
+    function title()
+    {
+        if ($this->page == 1) {
+            return sprintf(_('%s subscriptions'), $this->user->nickname);
         } else {
-            return sprintf(_('These are the people whose notices %s listens to.'), $profile->nickname);
+            return sprintf(_('%s subscriptions, page %d'),
+                           $this->user->nickname,
+                           $this->page);
         }
     }
 
-    function fields()
+    function showPageNotice()
     {
-        return array('subscribed', 'subscriber');
+        $user =& common_current_user();
+        if ($user && ($user->id == $this->profile->id)) {
+            $this->element('p', null,
+                           _('These are the people whose notices '.
+                             'you listen to.'));
+        } else {
+            $this->element('p', null,
+                           sprintf(_('These are the people whose '.
+                                     'notices %s listens to.'),
+                                   $this->profile->nickname));
+        }
     }
 
-    function div_class()
+    function showLocalNav()
     {
-        return 'subscriptions';
+        $nav = new SubGroupNav($this, $this->user);
+        $nav->show();
     }
 
-    function get_other(&$subs)
+    function showContent()
     {
-        return $subs->subscribed;
-    }
+        $offset = ($this->page-1) * PROFILES_PER_PAGE;
+        $limit =  PROFILES_PER_PAGE + 1;
 
-    function profile_list_class()
-    {
-        return 'SubscriptionsList';
+        $subscriptions = $this->user->getSubscriptions($offset, $limit);
+
+        if ($subs) {
+            $subscriptions_list = new SubscriptionsList($subscriptions, null, $this);
+            $subscriptions_list->show();
+        }
+
+        $subscriptions->free();
+
+        $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
+                          $this->page, 'subscriptions',
+                          array('nickname' => $this->user->nickname));
     }
 }
 
 class SubscriptionsList extends ProfileList
 {
-
-    function show_owner_controls($profile)
+    function showOwnerControls($profile)
     {
-
         $sub = Subscription::pkeyGet(array('subscriber' => $this->owner->id,
                                            'subscribed' => $profile->id));
         if (!$sub) {
@@ -73,9 +171,9 @@ class SubscriptionsList extends ProfileList
         }
 
         $this->elementStart('form', array('id' => 'subedit-' . $profile->id,
-                                           'method' => 'post',
-                                           'class' => 'subedit',
-                                           'action' => common_local_url('subedit')));
+                                          'method' => 'post',
+                                          'class' => 'subedit',
+                                          'action' => common_local_url('subedit')));
         $this->hidden('token', common_session_token());
         $this->hidden('profile', $profile->id);
         $this->checkbox('jabber', _('Jabber'), $sub->jabber);