Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java
===================================================================
diff -u -r434a2aec5c62876edcb6dc8908896939080f1cf2 -r4d9c834a6dd2067f34b9ee2acaed81ff7b61d2f2
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java	(.../ImageGalleryOutputFactory.java)	(revision 434a2aec5c62876edcb6dc8908896939080f1cf2)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java	(.../ImageGalleryOutputFactory.java)	(revision 4d9c834a6dd2067f34b9ee2acaed81ff7b61d2f2)
@@ -32,6 +32,7 @@
 import java.util.TreeMap;
 
 import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
+import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.OutputFactory;
 import org.lamsfoundation.lams.tool.SimpleURL;
 import org.lamsfoundation.lams.tool.ToolOutput;
@@ -203,29 +204,30 @@
 	for (ImageGalleryItem image : allImages) {
 	    itemIds.add(image.getUid());
 	}
+	
+	boolean isCommentsEnabled = imageGalleryService.isCommentsEnabled(contentId);
 
 	int countComments = 0;
-	if (user != null) {
-	    boolean isCommentsByOtherUsersRequired = false;
-	    List<ItemRatingDTO> RatingCriteriaDtos = imageGalleryService.getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, user.getUserId());
-	    
-	    Iterator<ImageGalleryItem> it = allImages.iterator();
-	    while (it.hasNext()) {
-		ImageGalleryItem image = it.next();
-//		Set<ImageComment> imageComments = image.getComments();
-//		for (ImageComment comment : imageComments) {
-//		    if (user.getUserId().equals(comment.getCreateBy().getUserId())) {
-//			countComments++;
-//		    }
-//		}
+	if (isCommentsEnabled) {
+
+	    boolean isCommentsByOtherUsersRequired = user == null;
+	    Long userId = user == null ? -1L : user.getUserId();
+	    List<ItemRatingDTO> ratingCriteriaDtos = imageGalleryService.getRatingCriteriaDtos(contentId, itemIds,
+		    isCommentsByOtherUsersRequired, userId);
+
+	    if (user != null) {
+		for (ItemRatingDTO ratingCriteriaDto : ratingCriteriaDtos) {
+		    boolean isUserCommentedOnThisImage = ratingCriteriaDto.getCommentPostedByUser() != null;
+		    if (isUserCommentedOnThisImage) {
+			countComments++;
+		    }
+		}
+
+	    } else {
+		for (ItemRatingDTO ratingCriteriaDto : ratingCriteriaDtos) {
+		    countComments += ratingCriteriaDto.getCommentDtos().size();
+		}
 	    }
-	} else {
-	    for (ImageGalleryItem image : allImages) {
-//		Set<ImageComment> imageComments = image.getComments();
-//		for (ImageComment comment : imageComments) {
-//		    countComments++;
-//		}
-	    }
 	}
 
 	return new ToolOutput(ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED, getI18NText(
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -r434a2aec5c62876edcb6dc8908896939080f1cf2 -r4d9c834a6dd2067f34b9ee2acaed81ff7b61d2f2
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 434a2aec5c62876edcb6dc8908896939080f1cf2)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 4d9c834a6dd2067f34b9ee2acaed81ff7b61d2f2)
@@ -10,7 +10,6 @@
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 <c:set var="isImageSelected" value="${not empty sessionMap.currentImage}" />
 
-
 <script type="text/javascript" src="<html:rewrite page='/includes/javascript/thickbox.js'/>"></script>
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 <c:if test="${isImageSelected}">
@@ -57,20 +56,13 @@
 
 <c:if test="${(mode != 'teacher') && (imageGallery.allowRank || imageGallery.allowVote || imageGallery.allowShareImages)}">
 
-	<c:if test="${sessionMap.isCommentsEnabled && sessionMap.commentsMinWordsLimit != 0}">
-		<div class="info rating-info">
-			<fmt:message key="label.minimum.number.words">
-				<fmt:param>: ${sessionMap.commentsMinWordsLimit}</fmt:param>
-			</fmt:message>
-		</div>
-	</c:if>
-
 	<%--Ranking area---------------------------------------%>
 	
 	<c:if test="${imageGallery.allowRank && isImageSelected}">
 		
 		<lams:Rating itemRatingDto="${sessionMap.itemRatingDto}" disabled="${finishedLock}" isItemAuthoredByUser="${sessionMap.isAuthor}"
-				maxRates="${imageGallery.maximumRates}" countRatedItems="${sessionMap.countRatedItems}" />
+				maxRates="${imageGallery.maximumRates}" countRatedItems="${sessionMap.countRatedItems}"
+				minNumberWordsLabel="label.minimum.number.words" />
 		<br><br>
 	</c:if>