Index: messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java
===================================================================
--- messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java	(revision 310401)
+++ messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java	(working copy)
@@ -7786,7 +7786,7 @@
 				Iterator msgIter = messages.iterator();
 				while (msgIter.hasNext()){
 					DiscussionMessageBean msg = (DiscussionMessageBean) msgIter.next();
-					if ((msg.isMsgApproved() || msg.getIsOwn()) && (!excludeDeleted || (excludeDeleted && !msg.getDeleted())))
+					if ((msg.isMsgApproved() || msg.getIsOwn()) && (!excludeDeleted || (excludeDeleted && !msg.getDeleted()) || ((excludeDeletedOnlyWithoutChild)&&(msg.getHasNotDeletedDescendant(null)))))
 						viewableMsgs.add(msg);
 				}
 			}