Index: openacs-4/contrib/packages/simulation/www/simplay/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/message.tcl,v
diff -u -r1.26.2.1 -r1.26.2.2
--- openacs-4/contrib/packages/simulation/www/simplay/message.tcl	16 Mar 2004 16:16:19 -0000	1.26.2.1
+++ openacs-4/contrib/packages/simulation/www/simplay/message.tcl	17 Mar 2004 09:45:56 -0000	1.26.2.2
@@ -190,8 +190,9 @@
         set attachments ""
         foreach attachment_set $attachments_set_list {
             set object_url [simulation::object::content_url -name [ns_set get $attachment_set name]]
-            set object_title [ns_set get $attachment_set title]
-            append attachments "<a href=\"$object_url\">$object_title</a> ($content(mime_type))<br>"
+            set object_title [ns_set get $attachment_set title].
+            set mime_type [ns_set get $attachment_set mime_type]
+            append attachments "<a href=\"$object_url\">$object_title</a> ($mime_type)<br>"
         }
         if { [llength $attachments_set_list] == 0 } {
             element set_properties message attachments -widget hidden
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.2.1 -r1.10.2.2
--- openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp	16 Mar 2004 17:31:34 -0000	1.10.2.1
+++ openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp	17 Mar 2004 09:45:56 -0000	1.10.2.2
@@ -39,4 +39,10 @@
   </p>
 </if>
 
+<if @received_attachments@ not nil>
+  <p>
+    Attachments in received message: @received_attachments;noquote@
+  </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.2.1 -r1.22.2.2
--- openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl	16 Mar 2004 17:31:34 -0000	1.22.2.1
+++ openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl	17 Mar 2004 09:45:56 -0000	1.22.2.2
@@ -9,6 +9,7 @@
     {return_url ""}
     subject:optional
     body:optional    
+    received_message_item_id:optional
 }
 
 # FIXME: I am exporting the enabled_action_id list as the string variable enabled_action_ids in 
@@ -37,12 +38,30 @@
         set return_url [export_vars -base tasks { case_id role_id }]
     }
 
-    if { ![info exists body] } {
+    if { [info exists body] } {
+        # We have a prepopulated body. This means we are responding to a message (see else clause below)
+        # Display a listing of any attachments in the message being responded to
+        set attachments_set_list [bcms::item::list_related_items \
+                                      -revision live \
+                                      -item_id $received_message_item_id \
+                                      -relation_tag attachment \
+                                      -return_list]
+
+        set received_attachments ""
+        foreach attachment_set $attachments_set_list {
+            set object_url [simulation::object::content_url -name [ns_set get $attachment_set name]]
+            set object_title [ns_set get $attachment_set title]
+            set mime_type [ns_set get $attachment_set mime_type]
+            append received_attachments "<a href=\"$object_url\">$object_title</a> ($mime_type)<br>"
+        }
+        
+    } else {
         # 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,
+        if {[db_0or1row select_received_message {
+            select sm.item_id as received_message_item_id,
+                   sm.from_role_id,
                    sm.to_role_id,
                    sm.creation_date,
                    cr.title as subject,
@@ -80,7 +99,7 @@
 
 [ad_html_text_convert -from $mime_type -to "text/plain" $triggering_body]"
 
-            ad_returnredirect [export_vars -base [ad_conn url] { enabled_action_id role_id subject body bulk_p}]
+            ad_returnredirect [export_vars -base [ad_conn url] { enabled_action_id role_id subject body bulk_p received_message_item_id}]
         }    
     }
 
Index: openacs-4/packages/simulation/www/simplay/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/message.tcl,v
diff -u -r1.26.2.1 -r1.26.2.2
--- openacs-4/packages/simulation/www/simplay/message.tcl	16 Mar 2004 16:16:19 -0000	1.26.2.1
+++ openacs-4/packages/simulation/www/simplay/message.tcl	17 Mar 2004 09:45:56 -0000	1.26.2.2
@@ -190,8 +190,9 @@
         set attachments ""
         foreach attachment_set $attachments_set_list {
             set object_url [simulation::object::content_url -name [ns_set get $attachment_set name]]
-            set object_title [ns_set get $attachment_set title]
-            append attachments "<a href=\"$object_url\">$object_title</a> ($content(mime_type))<br>"
+            set object_title [ns_set get $attachment_set title].
+            set mime_type [ns_set get $attachment_set mime_type]
+            append attachments "<a href=\"$object_url\">$object_title</a> ($mime_type)<br>"
         }
         if { [llength $attachments_set_list] == 0 } {
             element set_properties message attachments -widget hidden
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.2.1 -r1.10.2.2
--- openacs-4/packages/simulation/www/simplay/task-detail.adp	16 Mar 2004 17:31:34 -0000	1.10.2.1
+++ openacs-4/packages/simulation/www/simplay/task-detail.adp	17 Mar 2004 09:45:56 -0000	1.10.2.2
@@ -39,4 +39,10 @@
   </p>
 </if>
 
+<if @received_attachments@ not nil>
+  <p>
+    Attachments in received message: @received_attachments;noquote@
+  </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.2.1 -r1.22.2.2
--- openacs-4/packages/simulation/www/simplay/task-detail.tcl	16 Mar 2004 17:31:34 -0000	1.22.2.1
+++ openacs-4/packages/simulation/www/simplay/task-detail.tcl	17 Mar 2004 09:45:56 -0000	1.22.2.2
@@ -9,6 +9,7 @@
     {return_url ""}
     subject:optional
     body:optional    
+    received_message_item_id:optional
 }
 
 # FIXME: I am exporting the enabled_action_id list as the string variable enabled_action_ids in 
@@ -37,12 +38,30 @@
         set return_url [export_vars -base tasks { case_id role_id }]
     }
 
-    if { ![info exists body] } {
+    if { [info exists body] } {
+        # We have a prepopulated body. This means we are responding to a message (see else clause below)
+        # Display a listing of any attachments in the message being responded to
+        set attachments_set_list [bcms::item::list_related_items \
+                                      -revision live \
+                                      -item_id $received_message_item_id \
+                                      -relation_tag attachment \
+                                      -return_list]
+
+        set received_attachments ""
+        foreach attachment_set $attachments_set_list {
+            set object_url [simulation::object::content_url -name [ns_set get $attachment_set name]]
+            set object_title [ns_set get $attachment_set title]
+            set mime_type [ns_set get $attachment_set mime_type]
+            append received_attachments "<a href=\"$object_url\">$object_title</a> ($mime_type)<br>"
+        }
+        
+    } else {
         # 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,
+        if {[db_0or1row select_received_message {
+            select sm.item_id as received_message_item_id,
+                   sm.from_role_id,
                    sm.to_role_id,
                    sm.creation_date,
                    cr.title as subject,
@@ -80,7 +99,7 @@
 
 [ad_html_text_convert -from $mime_type -to "text/plain" $triggering_body]"
 
-            ad_returnredirect [export_vars -base [ad_conn url] { enabled_action_id role_id subject body bulk_p}]
+            ad_returnredirect [export_vars -base [ad_conn url] { enabled_action_id role_id subject body bulk_p received_message_item_id}]
         }    
     }