Merge commit 'e6faf1b0efa08d8b88cc42c2d35339dcd4fa65d1'
diff --git a/ForgeDiscussion/forgediscussion/model/forum.py b/ForgeDiscussion/forgediscussion/model/forum.py
index bab3edf..f0e90c0 100644
--- a/ForgeDiscussion/forgediscussion/model/forum.py
+++ b/ForgeDiscussion/forgediscussion/model/forum.py
@@ -215,6 +215,11 @@
         history_class = ForumPostHistory
         indexes = [
             'timestamp',  # for the posts_24hr site_stats query
+            (  # for last_post queries on thread listing page
+                'thread_id',
+                'deleted',
+                ('timestamp', pymongo.DESCENDING),
+            ),
         ]
     type_s = 'Post'
 
@@ -245,4 +250,5 @@
         polymorphic_identity = 'ForumAttachment'
     attachment_type = FieldProperty(str, if_missing='ForumAttachment')
 
+
 Mapper.compile_all()