Index: openacs-4/contrib/packages/simulation/www/simplay/case.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/case.adp,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/contrib/packages/simulation/www/simplay/case.adp	30 Jan 2004 12:13:37 -0000	1.11
+++ openacs-4/contrib/packages/simulation/www/simplay/case.adp	16 Mar 2004 17:31:34 -0000	1.11.2.1
@@ -4,15 +4,15 @@
 
 <h3>Recent Messages</h3>
 
-<include src="/packages/simulation/lib/messages"  user_id="@user_id@" case_id="@case_id@" role_id="@role_id@" limit="5">
+<include src="/packages/simulation/lib/messages"  case_id="@case_id@" role_id="@role_id@" limit="5">
 
 <ul class="action-links">
   <li><a href="@messages_url@">All messages...</a></li>
 </ul>
 
 <h3>Tasks</h3>
 
-<include src="/packages/simulation/lib/tasks" user_id="@user_id@" case_id="@case_id@" role_id="@role_id@">
+<include src="/packages/simulation/lib/tasks" case_id="@case_id@" role_id="@role_id@">
 
 <p></p>
 
Index: openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/task-detail.adp,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp	4 Mar 2004 12:09:44 -0000	1.10
+++ openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp	16 Mar 2004 17:31:34 -0000	1.10.2.1
@@ -31,4 +31,12 @@
 @documents_pre_form;noquote@
 </p>
 
+<if @attachment_options@ nil>
+  <p>
+    <font color="red"><em>NOTE</em></font>: To attach a document to your message you need to <a
+    href="@document_upload_url@">upload a document</a> to your
+    portfolio before writing the message.
+  </p>
+</if>
+
 <formtemplate id="@form_id@"></formtemplate>
Index: openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/task-detail.tcl,v
diff -u -r1.22 -r1.22.2.1
--- openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl	12 Mar 2004 15:49:43 -0000	1.22
+++ openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl	16 Mar 2004 17:31:34 -0000	1.22.2.1
@@ -38,6 +38,9 @@
     }
 
     if { ![info exists body] } {
+        # If this is a message task (with recipients) and its recipients have previously executed a message task
+        # that put us in the current state then we consider this a response and we prepopulate the message
+        # subject and body with text from the message being responded to. 
         if {[db_0or1row select_triggering_message_id {
             select sm.from_role_id,
                    sm.to_role_id,
@@ -51,11 +54,19 @@
               and sm.entry_id = (select max(wcl.entry_id)
                                  from workflow_case_log wcl,
                                       workflow_fsm_actions wfa,
-                                      workflow_case_fsm wcf
+                                      workflow_case_fsm wcf,
+                                      sim_messagesx sm2
                                  where wcl.case_id = sm.case_id
                                  and wcl.action_id = wfa.action_id
                                  and wcf.case_id = wcl.case_id
-                                 and wfa.new_state = wcf.current_state)
+                                 and wfa.new_state = wcf.current_state
+                                 and sm2.entry_id = wcl.entry_id
+                                 and sm2.to_role_id = :role_id
+                                 and sm2.from_role_id in (select recipient
+                                                          from sim_task_recipients
+                                                          where task_id = :action_id
+                                                          )
+                                 )
               and sm.case_id = :case_id
         }] } {
             set subject "Re: $subject"
@@ -125,6 +136,8 @@
 set context [list [list . "SimPlay"] [list [export_vars -base case { case_id role_id }] "Case"] [list [export_vars -base tasks { case_id role_id }] "Tasks"] $page_title]
 set documents_pre_form ""
 
+set document_upload_url [export_vars -base document-upload {case_id role_id {return_url {[ad_return_url]}}}]
+
 if { ![empty_string_p $action(recipients)] } {
     # We have recipient roles - use message form
 
Index: openacs-4/packages/simulation/www/simplay/case.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/case.adp,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/simulation/www/simplay/case.adp	30 Jan 2004 12:13:37 -0000	1.11
+++ openacs-4/packages/simulation/www/simplay/case.adp	16 Mar 2004 17:31:34 -0000	1.11.2.1
@@ -4,15 +4,15 @@
 
 <h3>Recent Messages</h3>
 
-<include src="/packages/simulation/lib/messages"  user_id="@user_id@" case_id="@case_id@" role_id="@role_id@" limit="5">
+<include src="/packages/simulation/lib/messages"  case_id="@case_id@" role_id="@role_id@" limit="5">
 
 <ul class="action-links">
   <li><a href="@messages_url@">All messages...</a></li>
 </ul>
 
 <h3>Tasks</h3>
 
-<include src="/packages/simulation/lib/tasks" user_id="@user_id@" case_id="@case_id@" role_id="@role_id@">
+<include src="/packages/simulation/lib/tasks" case_id="@case_id@" role_id="@role_id@">
 
 <p></p>
 
Index: openacs-4/packages/simulation/www/simplay/task-detail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/task-detail.adp,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/simulation/www/simplay/task-detail.adp	4 Mar 2004 12:09:44 -0000	1.10
+++ openacs-4/packages/simulation/www/simplay/task-detail.adp	16 Mar 2004 17:31:34 -0000	1.10.2.1
@@ -31,4 +31,12 @@
 @documents_pre_form;noquote@
 </p>
 
+<if @attachment_options@ nil>
+  <p>
+    <font color="red"><em>NOTE</em></font>: To attach a document to your message you need to <a
+    href="@document_upload_url@">upload a document</a> to your
+    portfolio before writing the message.
+  </p>
+</if>
+
 <formtemplate id="@form_id@"></formtemplate>
Index: openacs-4/packages/simulation/www/simplay/task-detail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/task-detail.tcl,v
diff -u -r1.22 -r1.22.2.1
--- openacs-4/packages/simulation/www/simplay/task-detail.tcl	12 Mar 2004 15:49:43 -0000	1.22
+++ openacs-4/packages/simulation/www/simplay/task-detail.tcl	16 Mar 2004 17:31:34 -0000	1.22.2.1
@@ -38,6 +38,9 @@
     }
 
     if { ![info exists body] } {
+        # If this is a message task (with recipients) and its recipients have previously executed a message task
+        # that put us in the current state then we consider this a response and we prepopulate the message
+        # subject and body with text from the message being responded to. 
         if {[db_0or1row select_triggering_message_id {
             select sm.from_role_id,
                    sm.to_role_id,
@@ -51,11 +54,19 @@
               and sm.entry_id = (select max(wcl.entry_id)
                                  from workflow_case_log wcl,
                                       workflow_fsm_actions wfa,
-                                      workflow_case_fsm wcf
+                                      workflow_case_fsm wcf,
+                                      sim_messagesx sm2
                                  where wcl.case_id = sm.case_id
                                  and wcl.action_id = wfa.action_id
                                  and wcf.case_id = wcl.case_id
-                                 and wfa.new_state = wcf.current_state)
+                                 and wfa.new_state = wcf.current_state
+                                 and sm2.entry_id = wcl.entry_id
+                                 and sm2.to_role_id = :role_id
+                                 and sm2.from_role_id in (select recipient
+                                                          from sim_task_recipients
+                                                          where task_id = :action_id
+                                                          )
+                                 )
               and sm.case_id = :case_id
         }] } {
             set subject "Re: $subject"
@@ -125,6 +136,8 @@
 set context [list [list . "SimPlay"] [list [export_vars -base case { case_id role_id }] "Case"] [list [export_vars -base tasks { case_id role_id }] "Tasks"] $page_title]
 set documents_pre_form ""
 
+set document_upload_url [export_vars -base document-upload {case_id role_id {return_url {[ad_return_url]}}}]
+
 if { ![empty_string_p $action(recipients)] } {
     # We have recipient roles - use message form