diff --git a/db/mork/src/Makefile.in b/db/mork/src/Makefile.in
index 76ddaa9cdac8..8b12a0f27096 100644
--- a/db/mork/src/Makefile.in
+++ b/db/mork/src/Makefile.in
@@ -30,12 +30,15 @@ EXPORTS = \
 
 CPPSRCS = \
 	orkinCell.cpp\
+	orkinCompare.cpp\
 	orkinEnv.cpp\
 	orkinFactory.cpp\
+	orkinFile.cpp\
 	orkinHeap.cpp\
 	orkinPortTableCursor.cpp\
 	orkinRow.cpp\
 	orkinRowCellCursor.cpp\
+	orkinSorting.cpp\
 	orkinStore.cpp\
 	orkinTable.cpp\
 	orkinTableRowCursor.cpp\
@@ -63,12 +66,15 @@ CPPSRCS = \
 	morkObject.cpp\
 	morkParser.cpp\
 	morkPool.cpp\
+	morkQuickSort.cpp\
 	morkRow.cpp\
 	morkRowCellCursor.cpp\
 	morkRowMap.cpp\
 	morkRowObject.cpp\
 	morkRowSpace.cpp\
 	morkSink.cpp\
+	morkSorting.cpp\
+	morkSortingRowCursor.cpp\
 	morkSpace.cpp\
 	morkStore.cpp\
 	morkStream.cpp\
diff --git a/db/mork/src/makefile.win b/db/mork/src/makefile.win
index 1ebf28789bfd..08ddea31005b 100644
--- a/db/mork/src/makefile.win
+++ b/db/mork/src/makefile.win
@@ -33,12 +33,15 @@ EXPORTS=			\
 LIBRARY_NAME=msgmork_s
 
 CPP_OBJS=   .\$(OBJDIR)\orkinCell.obj				\
+			.\$(OBJDIR)\orkinCompare.obj			\
 			.\$(OBJDIR)\orkinEnv.obj				\
 			.\$(OBJDIR)\orkinFactory.obj			\
+			.\$(OBJDIR)\orkinFile.obj			\
 			.\$(OBJDIR)\orkinHeap.obj				\
 			.\$(OBJDIR)\orkinPortTableCursor.obj	\
 			.\$(OBJDIR)\orkinRow.obj				\
 			.\$(OBJDIR)\orkinRowCellCursor.obj		\
+			.\$(OBJDIR)\orkinSorting.obj			\
 			.\$(OBJDIR)\orkinStore.obj				\
 			.\$(OBJDIR)\orkinTable.obj				\
 			.\$(OBJDIR)\orkinTableRowCursor.obj		\
@@ -67,12 +70,16 @@ CPP_OBJS=   .\$(OBJDIR)\orkinCell.obj				\
 			.\$(OBJDIR)\morkParser.obj				\
 			.\$(OBJDIR)\morkPool.obj				\
 			.\$(OBJDIR)\morkPortTableCursor.obj		\
+			.\$(OBJDIR)\morkQuickSort.obj			\
+			.\$(OBJDIR)\morkSearchRowCursor.obj		\
 			.\$(OBJDIR)\morkRow.obj					\
 			.\$(OBJDIR)\morkRowCellCursor.obj		\
 			.\$(OBJDIR)\morkRowMap.obj				\
 			.\$(OBJDIR)\morkRowObject.obj			\
 			.\$(OBJDIR)\morkRowSpace.obj			\
 			.\$(OBJDIR)\morkSink.obj				\
+			.\$(OBJDIR)\morkSorting.obj				\
+			.\$(OBJDIR)\morkSortingRowCursor.obj	\
 			.\$(OBJDIR)\morkSpace.obj				\
 			.\$(OBJDIR)\morkStore.obj				\
 			.\$(OBJDIR)\morkStream.obj				\
diff --git a/mailnews/db/mork/src/Makefile.in b/mailnews/db/mork/src/Makefile.in
index 76ddaa9cdac8..8b12a0f27096 100644
--- a/mailnews/db/mork/src/Makefile.in
+++ b/mailnews/db/mork/src/Makefile.in
@@ -30,12 +30,15 @@ EXPORTS = \
 
 CPPSRCS = \
 	orkinCell.cpp\
+	orkinCompare.cpp\
 	orkinEnv.cpp\
 	orkinFactory.cpp\
+	orkinFile.cpp\
 	orkinHeap.cpp\
 	orkinPortTableCursor.cpp\
 	orkinRow.cpp\
 	orkinRowCellCursor.cpp\
+	orkinSorting.cpp\
 	orkinStore.cpp\
 	orkinTable.cpp\
 	orkinTableRowCursor.cpp\
@@ -63,12 +66,15 @@ CPPSRCS = \
 	morkObject.cpp\
 	morkParser.cpp\
 	morkPool.cpp\
+	morkQuickSort.cpp\
 	morkRow.cpp\
 	morkRowCellCursor.cpp\
 	morkRowMap.cpp\
 	morkRowObject.cpp\
 	morkRowSpace.cpp\
 	morkSink.cpp\
+	morkSorting.cpp\
+	morkSortingRowCursor.cpp\
 	morkSpace.cpp\
 	morkStore.cpp\
 	morkStream.cpp\
diff --git a/mailnews/db/mork/src/makefile.win b/mailnews/db/mork/src/makefile.win
index 1ebf28789bfd..08ddea31005b 100644
--- a/mailnews/db/mork/src/makefile.win
+++ b/mailnews/db/mork/src/makefile.win
@@ -33,12 +33,15 @@ EXPORTS=			\
 LIBRARY_NAME=msgmork_s
 
 CPP_OBJS=   .\$(OBJDIR)\orkinCell.obj				\
+			.\$(OBJDIR)\orkinCompare.obj			\
 			.\$(OBJDIR)\orkinEnv.obj				\
 			.\$(OBJDIR)\orkinFactory.obj			\
+			.\$(OBJDIR)\orkinFile.obj			\
 			.\$(OBJDIR)\orkinHeap.obj				\
 			.\$(OBJDIR)\orkinPortTableCursor.obj	\
 			.\$(OBJDIR)\orkinRow.obj				\
 			.\$(OBJDIR)\orkinRowCellCursor.obj		\
+			.\$(OBJDIR)\orkinSorting.obj			\
 			.\$(OBJDIR)\orkinStore.obj				\
 			.\$(OBJDIR)\orkinTable.obj				\
 			.\$(OBJDIR)\orkinTableRowCursor.obj		\
@@ -67,12 +70,16 @@ CPP_OBJS=   .\$(OBJDIR)\orkinCell.obj				\
 			.\$(OBJDIR)\morkParser.obj				\
 			.\$(OBJDIR)\morkPool.obj				\
 			.\$(OBJDIR)\morkPortTableCursor.obj		\
+			.\$(OBJDIR)\morkQuickSort.obj			\
+			.\$(OBJDIR)\morkSearchRowCursor.obj		\
 			.\$(OBJDIR)\morkRow.obj					\
 			.\$(OBJDIR)\morkRowCellCursor.obj		\
 			.\$(OBJDIR)\morkRowMap.obj				\
 			.\$(OBJDIR)\morkRowObject.obj			\
 			.\$(OBJDIR)\morkRowSpace.obj			\
 			.\$(OBJDIR)\morkSink.obj				\
+			.\$(OBJDIR)\morkSorting.obj				\
+			.\$(OBJDIR)\morkSortingRowCursor.obj	\
 			.\$(OBJDIR)\morkSpace.obj				\
 			.\$(OBJDIR)\morkStore.obj				\
 			.\$(OBJDIR)\morkStream.obj				\