=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm	2013-08-06 03:47:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm	2013-08-07 05:39:23 +0000
@@ -197,11 +197,12 @@
 				<col/>
 			</colgroup>
 			<tr>
-				<th>$i18n.getString( "date" )</th>
-				<th>$i18n.getString( "events" )</th>
-				<th>$i18n.getString( "sender" )</th>
-				<th>$i18n.getString( "type" )</th>
-				<th>$i18n.getString( "message" )</th>
+				<th class="{sorter: false}">$i18n.getString( "date" )</th>
+				<th class="{sorter: false}">$i18n.getString( "program_stage" )</th>
+				<th class="{sorter: false}">$i18n.getString( "sender" )</th>
+				<th class="{sorter: false}">$i18n.getString( "type" )</th>
+				<th class="{sorter: false}">$i18n.getString( "message" )</th>
+				<th class="{sorter: false}">$i18n.getString( "operation" )</th>
 			</tr>
 			<tbody id='commentTB' name='commentTB'>
 				#set( $mark = false )
@@ -212,6 +213,9 @@
 						<td>$encoder.htmlEncode($comment.creator)</td>
 						<td>$i18n.getString('comment')</td>
 						<td>$encoder.htmlEncode($comment.commentText)</td>
+						<td>
+							<a href="javascript:removeComment( '$programStageInstance.id', '$comment.id' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
+						</td>
 					</tr>
 					#set( $mark = !$mark )
 				#end
@@ -222,6 +226,9 @@
 						<td>$encoder.htmlEncode($sms.sender)</td>
 						<td>$i18n.getString('message')</td>
 						<td>$encoder.htmlEncode($sms.message)</td>
+						<td>
+							<a href="javascript:removeMessage('', $programStageInstance.id, $sms.id )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
+						</td>
 					</tr>
 					#set( $mark = !$mark )
 				#end
@@ -261,5 +268,7 @@
 	var i18n_comment_added = '$encoder.jsEscape( $i18n.getString( "comment_added" ) , "'")';
 	var i18n_this_field_is_required = '$encoder.jsEscape( $i18n.getString( "this_field_is_required" ) , "'")';
 	var i18n_insert_a_due_date = '$encoder.jsEscape( $i18n.getString( "insert_a_due_date" ) , "'")';
+	var i18n_confirmation_delete_message = '$encoder.jsEscape( $i18n.getString( "confirmation_delete_message" ) , "'" )';
+	var i18n_deleting = '$encoder.jsEscape( $i18n.getString( "deleting" ) , "'" )';
 	
 </script>