Index: portal-impl/src/custom-sql/messageboards.xml
===================================================================
--- portal-impl/src/custom-sql/messageboards.xml	(revision 31072)
+++ portal-impl/src/custom-sql/messageboards.xml	(working copy)
@@ -37,29 +37,35 @@
 		<![CDATA[
 			SELECT
 				COUNT(DISTINCT threadId) AS COUNT_VALUE
-			FROM
-				MBMessage
-			WHERE
-				(groupId = ?) AND
-				(userId = ?)
-			ORDER BY
-				priority DESC,
-				modifiedDate DESC
+			FROM (
+				SELECT 
+  					threadId, priority, modifiedDate 
+  				FROM MBMessage
+  				WHERE
+					(groupId = ?) AND
+					(userId = ?)
+				ORDER BY
+					priority DESC,
+					modifiedDate DESC
+				)
 		]]>
 	</sql>
 	<sql id="com.liferay.portlet.messageboards.service.persistence.MBMessageFinder.countByG_U_A">
 		<![CDATA[
 			SELECT
 				COUNT(DISTINCT threadId) AS COUNT_VALUE
-			FROM
-				MBMessage
-			WHERE
-				(groupId = ?) AND
-				(userId = ?) AND
-				(anonymous = ?)
-			ORDER BY
-				priority DESC,
-				modifiedDate DESC
+			FROM (
+				SELECT 
+  					threadId, priority, modifiedDate 
+  				FROM MBMessage
+  				WHERE
+					(groupId = ?) AND
+					(userId = ?) AND
+					(anonymous = ?)
+				ORDER BY
+					priority DESC,
+					modifiedDate DESC
+				)
 		]]>
 	</sql>
 	<sql id="com.liferay.portlet.messageboards.service.persistence.MBMessageFinder.findByNoAssets">
@@ -81,31 +87,37 @@
 	</sql>
 	<sql id="com.liferay.portlet.messageboards.service.persistence.MBMessageFinder.findByG_U">
 		<![CDATA[
-			SELECT
-				DISTINCT threadId
-			FROM
-				MBMessage
-			WHERE
-				(groupId = ?) AND
-				(userId = ?)
-			ORDER BY
-				priority DESC,
-				modifiedDate DESC
+			SELECT 
+				DISTINCT threadId 
+			FROM (
+				SELECT 
+  					threadId, priority, modifiedDate 
+  				FROM MBMessage
+  				WHERE
+					(groupId = ?) AND
+					(userId = ?)
+				ORDER BY
+					priority DESC,
+					modifiedDate DESC
+				)
 		]]>
 	</sql>
 	<sql id="com.liferay.portlet.messageboards.service.persistence.MBMessageFinder.findByG_U_A">
 		<![CDATA[
-			SELECT
-				DISTINCT threadId
-			FROM
-				MBMessage
-			WHERE
-				(groupId = ?) AND
-				(userId = ?) AND
-				(anonymous = ?)
-			ORDER BY
-				priority DESC,
-				modifiedDate DESC
+			SELECT 
+				DISTINCT threadId 
+			FROM (
+				SELECT 
+  					threadId, priority, modifiedDate 
+  				FROM MBMessage
+  				WHERE
+					(groupId = ?) AND
+					(userId = ?) AND
+					(anonymous = ?)
+				ORDER BY
+					priority DESC,
+					modifiedDate DESC
+				)
 		]]>
 	</sql>
 	<sql id="com.liferay.portlet.messageboards.service.persistence.MBThreadFinder.countByS_G_U">