diff --git a/db/08to09.sql b/db/08to09.sql
index 582981614e..f305721541 100644
--- a/db/08to09.sql
+++ b/db/08to09.sql
@@ -112,3 +112,6 @@ alter table queue_item_new rename to queue_item;
 
 alter table file_to_post
     add index post_id_idx (post_id);
+
+alter table group_inbox
+    add index group_inbox_notice_id_idx (notice_id);
diff --git a/db/statusnet.sql b/db/statusnet.sql
index 4aa37ce1c5..3f95948e1e 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -458,7 +458,8 @@ create table group_inbox (
     created datetime not null comment 'date the notice was created',
 
     constraint primary key (group_id, notice_id),
-    index group_inbox_created_idx (created)
+    index group_inbox_created_idx (created),
+    index group_inbox_notice_id_idx (notice_id)
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;