Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java,v
diff -u -r1.12 -r1.13
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java	12 Jan 2015 15:55:33 -0000	1.12
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java	21 Jan 2015 20:03:47 -0000	1.13
@@ -95,10 +95,10 @@
 	    sortingOrder = "user.lastName DESC, user.firstName DESC";
 	    break;
 	case ForumConstants.SORT_BY_LAST_POSTING_ASC:
-	    sortingOrder = " MAX(message.created) ASC";
+	    sortingOrder = " MAX(message.updated) ASC";
 	    break;
 	case ForumConstants.SORT_BY_LAST_POSTING_DESC:
-	    sortingOrder = " MAX(message.created) DESC";
+	    sortingOrder = " MAX(message.updated) DESC";
 	    break;
 	case ForumConstants.SORT_BY_NUMBER_OF_POSTS_ASC:
 	    sortingOrder = " COUNT(message) ASC";
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/MessageDTOByDateComparator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/MessageDTOByDateComparator.java,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/MessageDTOByDateComparator.java	10 Jan 2015 22:08:02 -0000	1.1
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/MessageDTOByDateComparator.java	21 Jan 2015 20:03:47 -0000	1.2
@@ -18,9 +18,9 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt 
  * **************************************************************** 
- */  
- 
-/* $Id$ */  
+ */
+
+/* $Id$ */
 package org.lamsfoundation.lams.tool.forum.util;
 
 import java.util.Comparator;
@@ -38,12 +38,11 @@
     @Override
     public int compare(MessageDTO o1, MessageDTO o2) {
 	if (o1 != null && o2 != null) {
-	    Date o1Date = (o1.getMessage().getUpdated() == null) ? o1.getMessage().getCreated() : o1.getMessage()
-		    .getUpdated();
-	    Date o2Date = (o2.getMessage().getUpdated() == null) ? o2.getMessage().getCreated() : o2.getMessage()
-		    .getUpdated();
+	    Date o1Date = o1.getMessage().getUpdated();
+	    Date o2Date = o2.getMessage().getUpdated();
 
-	    return o1Date.compareTo(o2Date);
+	    return o1Date.compareTo(o2Date) == 0 ? o1.getMessage().getUid().compareTo(o2.getMessage().getUid())
+		    : o1Date.compareTo(o2Date);
 	} else if (o1 != null) {
 	    return 1;
 	} else {
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java,v
diff -u -r1.51 -r1.52
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	13 Jan 2015 22:30:03 -0000	1.51
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	21 Jan 2015 20:03:47 -0000	1.52
@@ -264,16 +264,16 @@
 	    sorting = ForumConstants.SORT_BY_USER_NAME_DESC;
 
 	} else if ((isSort2 != null) && isSort2.equals(0)) {
-	    sorting = ForumConstants.SORT_BY_LAST_POSTING_ASC;
+	    sorting = ForumConstants.SORT_BY_NUMBER_OF_POSTS_ASC;
 
 	} else if ((isSort2 != null) && isSort2.equals(1)) {
-	    sorting = ForumConstants.SORT_BY_LAST_POSTING_DESC;
+	    sorting = ForumConstants.SORT_BY_NUMBER_OF_POSTS_DESC;
 
 	} else if ((isSort3 != null) && isSort3.equals(0)) {
-	    sorting = ForumConstants.SORT_BY_NUMBER_OF_POSTS_ASC;
+	    sorting = ForumConstants.SORT_BY_LAST_POSTING_ASC;
 
 	} else if ((isSort3 != null) && isSort3.equals(1)) {
-	    sorting = ForumConstants.SORT_BY_NUMBER_OF_POSTS_DESC;
+	    sorting = ForumConstants.SORT_BY_LAST_POSTING_DESC;
 	}
 
 	Set<SessionDTO> sessionDtos = (Set<SessionDTO>) sessionMap.get(ForumConstants.ATTR_SESSION_DTOS);
@@ -310,7 +310,7 @@
 		MessageDTO lastMessage = messages.last();
 
 		// format lastEdited date
-		Date lastMessageDate = lastMessage.getMessage().getCreated();
+		Date lastMessageDate = lastMessage.getMessage().getUpdated();
 		lastMessageDate = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, lastMessageDate);
 		DateFormat dateFormatter = new SimpleDateFormat("d MMMM yyyy h:mm:ss a");
 		responseRow.put("lastMessageDate", dateFormatter.format(lastMessageDate));