--- C:\DOCUME~1\trepanj\LOCALS~1\Temp\PrivateMessagesTool.java-rev269.svn000.tmp.java	jeu. juil. 29 13:23:07 2010
+++ C:\DOCUME~1\trepanj\LOCALS~1\Temp\PrivateMessagesTool.java-rev300.svn000.tmp.java	jeu. juil. 29 13:23:07 2010
@@ -1013,7 +1013,7 @@
     }
   	else if (currentValue.equalsIgnoreCase(THREADED_VIEW))
   	{
-  		selectView = THREADED_VIEW;
+   		selectView = THREADED_VIEW;
   		if (searchPvtMsgs != null && !searchPvtMsgs.isEmpty())
   			this.rearrageTopicMsgsThreaded(true);
   		else
@@ -1298,7 +1298,7 @@
         this.setDetailMsg(dMsg); 
         setDetailMsgCount++;
        
-        prtMsgManager.markMessageAsReadForUser(dMsg.getMsg());
+        prtMsgManager.markMessageAsReadForUser(dMsg.getMsg(), getPrivateMessageTypeFromContext(msgNavMode));
                
         PrivateMessage initPrivateMessage = prtMsgManager.initMessageWithAttachmentsAndRecipients(dMsg.getMsg());
         this.setDetailMsg(new PrivateMessageDecoratedBean(initPrivateMessage));
@@ -1988,7 +1988,7 @@
       
       detailMsg= new PrivateMessageDecoratedBean(message);
       //get attachments
-      prtMsgManager.markMessageAsReadForUser(detailMsg.getMsg());
+      prtMsgManager.markMessageAsReadForUser(detailMsg.getMsg(), getPrivateMessageTypeFromContext(msgNavMode));
       
       PrivateMessage initPrivateMessage = prtMsgManager.initMessageWithAttachmentsAndRecipients(detailMsg.getMsg());
       this.setDetailMsg(new PrivateMessageDecoratedBean(initPrivateMessage));
@@ -2040,7 +2040,7 @@
       PrivateMessageDecoratedBean thisDmb = (PrivateMessageDecoratedBean)tempMsgs.get(currentMsgPosition+1);
       PrivateMessage message= (PrivateMessage) prtMsgManager.getMessageById(thisDmb.getMsg().getId()); 
       //get attachments
-      prtMsgManager.markMessageAsReadForUser(thisDmb.getMsg());
+      prtMsgManager.markMessageAsReadForUser(thisDmb.getMsg(), getPrivateMessageTypeFromContext(msgNavMode));
       
       PrivateMessage initPrivateMessage = prtMsgManager.initMessageWithAttachmentsAndRecipients(thisDmb.getMsg());
       this.setDetailMsg(new PrivateMessageDecoratedBean(initPrivateMessage));
@@ -2177,7 +2177,7 @@
       
       if(selectView!=null && selectView.equalsIgnoreCase(THREADED_VIEW))
       {
-      	this.rearrageTopicMsgsThreaded(false);
+       	this.rearrageTopicMsgsThreaded(false);
       }
 
       //set prev/next Topic
@@ -3851,6 +3851,9 @@
       
       PrivateMessageDecoratedBean dbean= new PrivateMessageDecoratedBean(element);
       //if processSelectAll is set, then set isSelected true for all messages,
+      
+      
+      // TODO: utiliser getisselected pour faire le code qui suit
       if(selectAll)
       {
         dbean.setIsSelected(true);
@@ -4343,9 +4346,9 @@
 			{
 				msgSelected = true;
 				if (readStatus) {
-					prtMsgManager.markMessageAsReadForUser(decoMessage.getMsg());
+					prtMsgManager.markMessageAsReadForUser(decoMessage.getMsg(), getPrivateMessageTypeFromContext(msgNavMode));
 				} else {
-					prtMsgManager.markMessageAsUnreadForUser(decoMessage.getMsg());
+					prtMsgManager.markMessageAsUnreadForUser(decoMessage.getMsg(), getPrivateMessageTypeFromContext(msgNavMode));
 				}
 
 				if (searchMode)