Index: messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/MessageImpl.hbm.xml
===================================================================
--- messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/MessageImpl.hbm.xml	(revision 82257)
+++ messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/MessageImpl.hbm.xml	(working copy)
@@ -346,7 +346,9 @@
 
 <!--  Gets counts of message user can access grouped by site and role/group.
 	  Needed since user can have different roles in different sites -->
-  <query name="findDiscussionForumMessageCountsForAllSites">
+	  
+  <!--  first test by custom permissions (permissionLevel id) -->
+  <query name="findDiscussionForumMessageCountsForAllSitesByPermissionLevelId">
     <![CDATA[select a.contextId, membershipItem.name, count(*)
     		 from org.sakaiproject.component.app.messageforums.dao.hibernate.MessageImpl as messages
     		   join messages.topic as topic
@@ -360,8 +362,7 @@
                messages.draft = false and
                messages.deleted = false and
               membershipItem.name in ( :roleList ) and
-             ((pl.typeUuid != :customTypeUuid and pl.name = membershipItem.permissionLevelName) or
-               membershipItem.permissionLevel = pl.id)  and
+               membershipItem.permissionLevel = pl.id  and
               (pl.read = true and 
               (pl.moderatePostings = true or 
                messages.approved = true or
@@ -371,6 +372,32 @@
  
  </query>
 
+  <!--  second test by non-custom permissions (permissionLevelName) -->
+  <query name="findDiscussionForumMessageCountsForAllSitesByPermissionLevelName">
+    <![CDATA[select a.contextId, membershipItem.name, count(*)
+    		 from org.sakaiproject.component.app.messageforums.dao.hibernate.MessageImpl as messages
+    		   join messages.topic as topic
+    		   join topic.membershipItemSet as membershipItem
+               join topic.openForum as f
+               join f.area as a,
+    		   org.sakaiproject.component.app.messageforums.dao.hibernate.PermissionLevelImpl as pl
+             where a.contextId in ( :siteList ) and
+               f.draft = false and
+               topic.draft = false and
+               messages.draft = false and
+               messages.deleted = false and
+              membershipItem.name in ( :roleList ) and
+              (pl.typeUuid != :customTypeUuid and pl.name = membershipItem.permissionLevelName)  and
+              (pl.read = true and 
+              (pl.moderatePostings = true or 
+               messages.approved = true or
+               messages.createdBy = :userId))
+             group by a.contextId, membershipItem.name
+    ]]>
+ 
+ </query>
+
+
 <!-- Gets count of messages user has already read grouped by site and role/group.
 	 Needed since user can have different roles/groups in different sites or
 	 to deal with access allowed from different groups and/or overlapping
Index: messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/MessageForumsMessageManagerImpl.java
===================================================================
--- messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/MessageForumsMessageManagerImpl.java	(revision 82257)
+++ messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/MessageForumsMessageManagerImpl.java	(working copy)
@@ -193,19 +193,42 @@
     /**
      * FOR SYNOPTIC TOOL:
      * 		Returns the count of discussion forum messages grouped by site
-      */
-    public List findDiscussionForumMessageCountsForAllSites(final List siteList, final List roleList) {
+     */
+    public List findDiscussionForumMessageCountsForAllSitesByPermissionLevelId(final List siteList, final List roleList) {
     	if (siteList == null) {
-            LOG.error("findDiscussionForumMessageCountsForAllSites failed with null site list.");
+            LOG.error("findDiscussionForumMessageCountsForAllSitesByPermissionLevelId failed with null site list.");
             throw new IllegalArgumentException("Null Argument");
     	}	
         
     	HibernateCallback hcb = new HibernateCallback() {
                public Object doInHibernate(Session session) throws HibernateException, SQLException {
-                   Query q = session.getNamedQuery("findDiscussionForumMessageCountsForAllSites");
+                   Query q = session.getNamedQuery("findDiscussionForumMessageCountsForAllSitesByPermissionLevelId");
                     q.setParameterList("siteList", siteList);
                     q.setParameterList("roleList", roleList);
                     q.setParameter("userId", getCurrentUser(), Hibernate.STRING);
+                   return q.list();
+               }
+    	};
+
+        return (List) getHibernateTemplate().execute(hcb);
+    }
+
+    /**
+     * FOR SYNOPTIC TOOL:
+     * 		Returns the count of discussion forum messages grouped by site
+     */
+    public List findDiscussionForumMessageCountsForAllSitesByPermissionLevelName(final List siteList, final List roleList) {
+    	if (siteList == null) {
+            LOG.error("findDiscussionForumMessageCountsForAllSitesByPermissionLevelName failed with null site list.");
+            throw new IllegalArgumentException("Null Argument");
+    	}	
+        
+    	HibernateCallback hcb = new HibernateCallback() {
+               public Object doInHibernate(Session session) throws HibernateException, SQLException {
+                   Query q = session.getNamedQuery("findDiscussionForumMessageCountsForAllSitesByPermissionLevelName");
+                    q.setParameterList("siteList", siteList);
+                    q.setParameterList("roleList", roleList);
+                    q.setParameter("userId", getCurrentUser(), Hibernate.STRING);
                     q.setParameter("customTypeUuid", typeManager.getCustomLevelType(), Hibernate.STRING);
                    return q.list();
                }
@@ -213,16 +236,35 @@
 
         return (List) getHibernateTemplate().execute(hcb);
     }
+    
+    /**
+     * FOR SYNOPTIC TOOL:
+     * 		Returns the count of read discussion forum messages grouped by site
+     */
+    public List findDiscussionForumReadMessageCountsForAllSitesByPermissionLevelId(final List siteList, final List roleList) {
+        
+    	HibernateCallback hcb = new HibernateCallback() {
+               public Object doInHibernate(Session session) throws HibernateException, SQLException {
+                   Query q = session.getNamedQuery("findDiscussionForumReadMessageCountsForAllSitesByPermissionLevelId");
+                   q.setParameterList("siteList", siteList);
+                   q.setParameterList("roleList", roleList);
+                   q.setParameter("userId", getCurrentUser(), Hibernate.STRING);
+                   return q.list();
+               }
+    	};
+        
+        return (List) getHibernateTemplate().execute(hcb);
+    }
 
     /**
      * FOR SYNOPTIC TOOL:
      * 		Returns the count of read discussion forum messages grouped by site
      */
-    public List findDiscussionForumReadMessageCountsForAllSites(final List siteList, final List roleList) {
+    public List findDiscussionForumReadMessageCountsForAllSitesByPermissionLevelName(final List siteList, final List roleList) {
         
     	HibernateCallback hcb = new HibernateCallback() {
                public Object doInHibernate(Session session) throws HibernateException, SQLException {
-                   Query q = session.getNamedQuery("findDiscussionForumReadMessageCountsForAllSites");
+                   Query q = session.getNamedQuery("findDiscussionForumReadMessageCountsForAllSitesByPermissionLevelName");
                    q.setParameterList("siteList", siteList);
                    q.setParameterList("roleList", roleList);
                    q.setParameter("userId", getCurrentUser(), Hibernate.STRING);
@@ -233,7 +275,7 @@
         
         return (List) getHibernateTemplate().execute(hcb);
     }
-
+    
     /**
      * FOR SYNOPTIC TOOL:
      * 		Returns the count of discussion forum messages grouped by topics within a site
Index: messageforums-api/src/java/org/sakaiproject/api/app/messageforums/MessageForumsMessageManager.java
===================================================================
--- messageforums-api/src/java/org/sakaiproject/api/app/messageforums/MessageForumsMessageManager.java	(revision 82257)
+++ messageforums-api/src/java/org/sakaiproject/api/app/messageforums/MessageForumsMessageManager.java	(working copy)
@@ -119,9 +119,13 @@
     
     public int findReadViewableMessageCountByTopicId(Long topicId);
 
-    public List findDiscussionForumMessageCountsForAllSites(final List siteList, final List roleList);
+    public List findDiscussionForumMessageCountsForAllSitesByPermissionLevelId(final List siteList, final List roleList);
     
-    public List findDiscussionForumReadMessageCountsForAllSites(final List siteList, final List roleList);
+    public List findDiscussionForumMessageCountsForAllSitesByPermissionLevelName(final List siteList, final List roleList);
+    
+    public List findDiscussionForumReadMessageCountsForAllSitesByPermissionLevelId(final List siteList, final List roleList);
+    
+    public List findDiscussionForumReadMessageCountsForAllSitesByPermissionLevelName(final List siteList, final List roleList);
 
     public List findDiscussionForumMessageCountsForGroupedSitesByTopic(final List siteList, final List roleList); // added
 
Index: messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/MessageForumSynopticBean.java
===================================================================
--- messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/MessageForumSynopticBean.java	(revision 82257)
+++ messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/MessageForumSynopticBean.java	(working copy)
@@ -775,7 +775,11 @@
 			// If grouped in all sites, no processing needed
 			if (! siteListMinusGrouped.isEmpty()) {
 				List discussionForumMessageCounts = messageManager
-						.findDiscussionForumMessageCountsForAllSites(siteListMinusGrouped, roleList);
+						.findDiscussionForumMessageCountsForAllSitesByPermissionLevelId(siteListMinusGrouped, roleList);
+				
+				
+				discussionForumMessageCounts.addAll(messageManager
+						.findDiscussionForumMessageCountsForAllSitesByPermissionLevelName(siteListMinusGrouped, roleList));
 
 				discussionForumMessageCounts = filterMessageCountsByRole(discussionForumMessageCounts);
 		
@@ -783,7 +787,10 @@
 				if (! discussionForumMessageCounts.isEmpty()) {
 					// Pulls read discussion forum message counts from DB
 					List discussionForumReadMessageCounts = messageManager
-											.findDiscussionForumReadMessageCountsForAllSites(siteListMinusGrouped, roleList);
+						.findDiscussionForumReadMessageCountsForAllSitesByPermissionLevelId(siteListMinusGrouped, roleList);
+					
+					discussionForumReadMessageCounts.addAll(messageManager
+						.findDiscussionForumReadMessageCountsForAllSitesByPermissionLevelName(siteListMinusGrouped, roleList));
 
 					// if no read messages, totals are current message counts
 					if (discussionForumReadMessageCounts.isEmpty()) {