diff --git a/scripts/initializeinbox.php b/scripts/initializeinbox.php
deleted file mode 100644
index 44508fe22a..0000000000
--- a/scripts/initializeinbox.php
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - a distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
- *
- * 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/>.
- */
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-
-$shortoptions = 'i:n:af:';
-$longoptions = array('id=', 'nickname=', 'all', 'file=');
-
-$helptext = <<<END_OF_INITIALIZEINBOX_HELP
-initializeinbox.php [options]
-initialize the inbox for a user
-
-  -i --id         ID of user to update
-  -n --nickname   nickname of the user to update
-  -f FILENAME     read list of IDs from FILENAME (1 per line)
-  --file=FILENAME ditto
-  -a --all        update all
-
-END_OF_INITIALIZEINBOX_HELP;
-
-require_once INSTALLDIR.'/scripts/commandline.inc';
-
-try {
-    $user = null;
-
-    if (have_option('i', 'id')) {
-        $id = get_option_value('i', 'id');
-        $user = User::staticGet('id', $id);
-        if (empty($user)) {
-            throw new Exception("Can't find user with id '$id'.");
-        }
-        initializeInbox($user);
-    } else if (have_option('n', 'nickname')) {
-        $nickname = get_option_value('n', 'nickname');
-        $user = User::staticGet('nickname', $nickname);
-        if (empty($user)) {
-            throw new Exception("Can't find user with nickname '$nickname'");
-        }
-        initializeInbox($user);
-    } else if (have_option('a', 'all')) {
-        $user = new User();
-        if ($user->find()) {
-            while ($user->fetch()) {
-                initializeInbox($user);
-            }
-        }
-    } else if (have_option('f', 'file')) {
-        $filename = get_option_value('f', 'file');
-        if (!file_exists($filename)) {
-            throw new Exception("No such file '$filename'.");
-        } else if (!is_readable($filename)) {
-            throw new Exception("Can't read '$filename'.");
-        }
-        $ids = file($filename);
-        foreach ($ids as $id) {
-            $user = User::staticGet('id', $id);
-            if (empty($user)) {
-                print "Can't find user with id '$id'.\n";
-            }
-            initializeInbox($user);
-        }
-    } else {
-        show_help();
-        exit(1);
-    }
-} catch (Exception $e) {
-    print $e->getMessage()."\n";
-    exit(1);
-}
-
-function initializeInbox($user)
-{
-    if (!have_option('q', 'quiet')) {
-        print "Initializing inbox for $user->nickname...";
-    }
-
-    $inbox = Inbox::staticGet('user_id', $user->id);
-
-    if ($inbox && !empty($inbox->fake)) {
-        if (!have_option('q', 'quiet')) {
-            echo "(replacing faux cached inbox)";
-        }
-        $inbox = false;
-    }
-    if (!empty($inbox)) {
-        if (!have_option('q', 'quiet')) {
-            print "SKIP\n";
-        }
-    } else {
-        $inbox = Inbox::initialize($user->id);
-        if (!have_option('q', 'quiet')) {
-            if (empty($inbox)) {
-                print "ERR\n";
-            } else {
-                print "DONE\n";
-            }
-        }
-    }
-}
diff --git a/scripts/upgrade.php b/scripts/upgrade.php
old mode 100755
new mode 100644
index 64bc5da0e5..3536eddb63
--- a/scripts/upgrade.php
+++ b/scripts/upgrade.php
@@ -42,6 +42,7 @@ function main()
     fixupNoticeConversation();
     initConversation();
     fixupGroupURI();
+    initInbox();
 }
 
 function tableDefs()
@@ -183,4 +184,48 @@ function initConversation()
     printfnq("DONE.\n");
 }
 
+function initInbox()
+{
+    printfnq("Ensuring all users have an inbox...");
+
+    $user = new User();
+    $user->whereAdd('not exists (select user_id from inbox where user_id = user.id)');
+    $user->orderBy('id');
+
+    if ($user->find()) {
+
+        while ($user->fetch()) {
+
+            try {
+                $notice = new Notice();
+
+                $notice->selectAdd();
+                $notice->selectAdd('id');
+                $notice->joinAdd(array('profile_id', 'subscription:subscribed'));
+                $notice->whereAdd('subscription.subscriber = ' . $user->id);
+                $notice->whereAdd('notice.created >= subscription.created');
+
+                $ids = array();
+
+                if ($notice->find()) {
+                    while ($notice->fetch()) {
+                        $ids[] = $notice->id;
+                    }
+                }
+
+                $notice = null;
+
+                $inbox = new Inbox();
+                $inbox->user_id = $user->id;
+                $inbox->pack($ids);
+                $inbox->insert();
+            } catch (Exception $e) {
+                printv("Error initializing inbox: " . $e->getMessage());
+            }
+        }
+    }
+
+    printfnq("DONE.\n");
+}
+
 main();