Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r46bcb6ea758a272250071d1a571d008c6745e593 -rf65bf8d775c89d19993d672813a4af9f95266267
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 46bcb6ea758a272250071d1a571d008c6745e593)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f65bf8d775c89d19993d672813a4af9f95266267)
@@ -671,7 +671,7 @@
 label.showhide.prompt  =Show/Hide Replies
 message.complete.or.cancel.reply  =Please complete or cancel the current reply before starting a new reply.
 message.complete.or.cancel.edit  =Please complete or cancel the current edit before starting a new edit.
-label.show.more.messages  =More posts
+label.show.more.messages  =More Comments
 label.likes=Likes
 label.comment.body.validation=The comment must be between 1 and 5000 characters long.
 label.edited=Edited
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r46bcb6ea758a272250071d1a571d008c6745e593 -rf65bf8d775c89d19993d672813a4af9f95266267
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 46bcb6ea758a272250071d1a571d008c6745e593)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f65bf8d775c89d19993d672813a4af9f95266267)
@@ -661,7 +661,7 @@
 label.showhide.prompt  =Show/Hide Replies
 message.complete.or.cancel.reply  =Please complete or cancel the current reply before starting a new reply.
 message.complete.or.cancel.edit  =Please complete or cancel the current edit before starting a new edit.
-label.show.more.messages  =More posts
+label.show.more.messages  =More Comments
 label.likes=Likes
 label.comment.body.validation=The comment must be between 1 and 5000 characters long.
 label.edited=Edited
Index: lams_central/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r46bcb6ea758a272250071d1a571d008c6745e593 -rf65bf8d775c89d19993d672813a4af9f95266267
--- lams_central/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 46bcb6ea758a272250071d1a571d008c6745e593)
+++ lams_central/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision f65bf8d775c89d19993d672813a4af9f95266267)
@@ -25,7 +25,7 @@
 
 <script>
 function resizeCommentFrame(pixels){
-    var w = window.innerWidth;
-    var h = window.innerHeight;
+	pixels+=40;
+    document.getElementById('commentFrame').style.height=pixels+"px";
 }
 </script>
\ No newline at end of file
Index: lams_central/web/comments/comments.jsp
===================================================================
diff -u -rd8be0fc2c13bfb38ac7239cf7185895a31845e2b -rf65bf8d775c89d19993d672813a4af9f95266267
--- lams_central/web/comments/comments.jsp	(.../comments.jsp)	(revision d8be0fc2c13bfb38ac7239cf7185895a31845e2b)
+++ lams_central/web/comments/comments.jsp	(.../comments.jsp)	(revision f65bf8d775c89d19993d672813a4af9f95266267)
@@ -43,8 +43,7 @@
 			});
 			
 			function scrollDoneCallback() {
-				resizeIframe();
-				
+				resizeIframe();				
 			}
 		</script>		
 		
@@ -69,7 +68,7 @@
 			</div>
 			</div>
 			<script>
-				$('.scroll').jscroll({loadingHtml: '<img src="${loading_animation}" alt="${loading_words}" />${loading_words}',padding:30,autoTrigger:true,callback:scrollDoneCallback});
+				$('.scroll').jscroll({loadingHtml: '<img src="${loading_animation}" alt="${loading_words}" />${loading_words}',padding:30,autoTrigger:false,callback:scrollDoneCallback});
 			</script>
 			</c:if>
 					
Index: lams_central/web/comments/new.jsp
===================================================================
diff -u -r46bcb6ea758a272250071d1a571d008c6745e593 -rf65bf8d775c89d19993d672813a4af9f95266267
--- lams_central/web/comments/new.jsp	(.../new.jsp)	(revision 46bcb6ea758a272250071d1a571d008c6745e593)
+++ lams_central/web/comments/new.jsp	(.../new.jsp)	(revision f65bf8d775c89d19993d672813a4af9f95266267)
@@ -43,9 +43,9 @@
        				var loadString = '<html:rewrite page="/comments/viewTopicThread.do?sessionMapID="/>' + response.sessionMapID + "&threadUid=" + threadUid+"&commentUid="+commentUid;
 					$(newThreadDiv).load(loadString, function() {
 						highlightMessage();
+						resizeIframe();
 					});
 					clearNewForm();
-					resizeIframe();
 				} else if ( response.errMessage ) {
 					alert(response.errMessage);
 				} else {
Index: lams_central/web/comments/topicview.jsp
===================================================================
diff -u -rd8be0fc2c13bfb38ac7239cf7185895a31845e2b -rf65bf8d775c89d19993d672813a4af9f95266267
--- lams_central/web/comments/topicview.jsp	(.../topicview.jsp)	(revision d8be0fc2c13bfb38ac7239cf7185895a31845e2b)
+++ lams_central/web/comments/topicview.jsp	(.../topicview.jsp)	(revision f65bf8d775c89d19993d672813a4af9f95266267)
@@ -41,8 +41,9 @@
 			var parentDiv = document.getElementById('msg'+commentUid);
 			parentDiv.appendChild(replyDiv);
 			
-			$(replyDiv).load(url);
-			resizeIframe();
+			$(replyDiv).load(url, function() {
+				resizeIframe();
+			});
 		}
 	}
 	
@@ -59,8 +60,9 @@
 			var parentDiv = document.getElementById('msg'+commentUid);
 			parentDiv.appendChild(editDiv);
 
-			$(editDiv).load(url);
-			resizeIframe();
+			$(editDiv).load(url, function() {
+				resizeIframe();
+			});
 		}
 	}
 
Index: lams_central/web/includes/javascript/comments.js
===================================================================
diff -u -r46bcb6ea758a272250071d1a571d008c6745e593 -rf65bf8d775c89d19993d672813a4af9f95266267
--- lams_central/web/includes/javascript/comments.js	(.../comments.js)	(revision 46bcb6ea758a272250071d1a571d008c6745e593)
+++ lams_central/web/includes/javascript/comments.js	(.../comments.js)	(revision f65bf8d775c89d19993d672813a4af9f95266267)
@@ -1,5 +1,5 @@
 	function resizeIframe() {
-	//	parent.resizeCommentFrame(document.body.scrollHeight); Don't use at present - breaks the scrolling
+		parent.resizeCommentFrame(document.body.scrollHeight); 
 	}						
 
 	function highlightMessage() {
@@ -31,8 +31,8 @@
 				$(threadDiv).load(loadString, function() {
 					$('#msg'+commentUid).focus();
 					highlightMessage();
+					resizeIframe();
 				});
-				resizeIframe();
 			}
     	} else if ( response.errMessage ) {
 	    	// No valid id? Something failed. Assume it is a response message coming back.
Index: lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java
===================================================================
diff -u -r46bcb6ea758a272250071d1a571d008c6745e593 -rf65bf8d775c89d19993d672813a4af9f95266267
--- lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java	(.../CommentDAO.java)	(revision 46bcb6ea758a272250071d1a571d008c6745e593)
+++ lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java	(.../CommentDAO.java)	(revision f65bf8d775c89d19993d672813a4af9f95266267)
@@ -82,19 +82,13 @@
     private static final String SQL_QUERY_FIND_NEXT_THREAD_TOP = "select uid from lams_comment"
 	    + " where root_comment_uid = :rootUid and uid < :lastUid and comment_level = 1 order by uid DESC";
 
-//    private static final String SQL_QUERY_FIND_NEXT_THREAD_MESSAGES = "from " + Comment.class.getName()
-//	    + " where root_comment_uid = ? and comment_level > 1 and thread_comment_uid in ?";
-
     private static final String SQL_QUERY_FIND_NEXT_THREAD_MESSAGES = 
 	    "SELECT c.*, SUM(l.vote) likes_total, l2.vote user_vote FROM lams_comment c "
 	    + " LEFT JOIN lams_comment_likes l ON c.uid = l.comment_uid "
 	    + " LEFT JOIN lams_comment_likes l2 ON c.uid = l2.comment_uid AND l2.user_id=:userId "
 	    + " WHERE c.thread_comment_uid IN (:threadIds) "
 	    + " GROUP BY c.uid";
     
-//    private static final String SQL_QUERY_GET_COMPLETE_THREAD = "from " + Comment.class.getName()
-//	    + " where thread_comment_uid = ?";
-
     private static final String SQL_QUERY_GET_COMPLETE_THREAD = 
 	    "SELECT c.*, SUM(l.vote) likes_total, l2.vote user_vote FROM lams_comment c "
 	    + " LEFT JOIN lams_comment_likes l ON c.uid = l.comment_uid "
@@ -132,21 +126,20 @@
     @Override
     @SuppressWarnings("unchecked")
     public SortedSet<Comment> getNextThreadByThreadId(final Long rootTopicId, final Long previousThreadMessageId, Integer numberOfThreads, Integer userId) {
-	HibernateTemplate template = this.getHibernateTemplate();
 
-	template.setMaxResults(numberOfThreads);
 	List<Number> threadUidList = null;
 	if (previousThreadMessageId == null || previousThreadMessageId == 0L) {
 	    threadUidList = (List<Number>) getSession().createSQLQuery(SQL_QUERY_FIND_FIRST_THREAD_TOP)
 		    .setLong("rootUid", rootTopicId)
+		    .setMaxResults(numberOfThreads)
 		    .list();
 	} else {
 	    threadUidList = (List<Number>) getSession().createSQLQuery(SQL_QUERY_FIND_NEXT_THREAD_TOP)
 		    .setLong("rootUid", rootTopicId)
 		    .setLong("lastUid", previousThreadMessageId)
+		    .setMaxResults(numberOfThreads)
 		    .list();
 	}
-	template.setMaxResults(0);
 
 	if (threadUidList != null && threadUidList.size() > 0) {
 	    SQLQuery query =  getSession().createSQLQuery(SQL_QUERY_FIND_NEXT_THREAD_MESSAGES);
Index: lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentLikeDAO.java
===================================================================
diff -u -r46bcb6ea758a272250071d1a571d008c6745e593 -rf65bf8d775c89d19993d672813a4af9f95266267
--- lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentLikeDAO.java	(.../CommentLikeDAO.java)	(revision 46bcb6ea758a272250071d1a571d008c6745e593)
+++ lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentLikeDAO.java	(.../CommentLikeDAO.java)	(revision f65bf8d775c89d19993d672813a4af9f95266267)
@@ -25,12 +25,10 @@
 
 package org.lamsfoundation.lams.comments.dao.hibernate;
 
-import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.comments.dao.ICommentLikeDAO;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 public class CommentLikeDAO extends HibernateDaoSupport implements ICommentLikeDAO {
-    private static Logger log = Logger.getLogger(CommentLikeDAO.class);
     
     private static String INSERT_LIKE = "INSERT IGNORE INTO lams_comment_likes(comment_uid, user_id, vote) VALUES (:comment,:user,:vote);";
 	    
@@ -40,8 +38,6 @@
 		.setParameter("user", userId)
 		.setParameter("vote", vote)
 		.executeUpdate();
-
-	log.debug("Insert returned "+status);
 	return status == 1;
     }
 
Index: lams_common/src/java/org/lamsfoundation/lams/comments/util/CommentConstants.java
===================================================================
diff -u -r46bcb6ea758a272250071d1a571d008c6745e593 -rf65bf8d775c89d19993d672813a4af9f95266267
--- lams_common/src/java/org/lamsfoundation/lams/comments/util/CommentConstants.java	(.../CommentConstants.java)	(revision 46bcb6ea758a272250071d1a571d008c6745e593)
+++ lams_common/src/java/org/lamsfoundation/lams/comments/util/CommentConstants.java	(.../CommentConstants.java)	(revision f65bf8d775c89d19993d672813a4af9f95266267)
@@ -49,7 +49,7 @@
     // for paging long topics & inlining reply
     public static final String PAGE_LAST_ID = "pageLastId";
     public static final String PAGE_SIZE = "size";
-    public static final int DEFAULT_PAGE_SIZE = 4;
+    public static final int DEFAULT_PAGE_SIZE = 2;
     public static final String ATTR_NO_MORE_PAGES = "noMorePages";
 
     public static final int MAX_BODY_LENGTH = 5000;
Index: lams_tool_nb/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r5b5e0e132cfecce0e21294be6108750a6c4a4f37 -rf65bf8d775c89d19993d672813a4af9f95266267
--- lams_tool_nb/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 5b5e0e132cfecce0e21294be6108750a6c4a4f37)
+++ lams_tool_nb/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision f65bf8d775c89d19993d672813a4af9f95266267)
@@ -25,7 +25,7 @@
 
 <script>
 function resizeCommentFrame(pixels){
-    var w = window.innerWidth;
-    var h = window.innerHeight;
+	pixels+=40;
+    document.getElementById('commentFrame').style.height=pixels+"px";
 }
 </script>
\ No newline at end of file