Index: openacs-4/packages/forums/lib/message/row.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/forums/lib/message/row.adp	23 Mar 2005 22:18:57 -0000	1.8
+++ openacs-4/packages/forums/lib/message/row.adp	26 Mar 2005 20:29:20 -0000	1.9
@@ -22,7 +22,7 @@
     </if>
     <div class="details">
   <div style="float: left; padding-right: 4px;">
-    <a id="toggle@message.message_id@" class="dynexpanded" href="javascript:void(toggle(@message.message_id@))"><img src="/resources/forums/Expand16.gif" width="16" height="16" alt="+" /></a>
+    <a id="toggle@message.message_id@" class="dynexpanded" href="javascript:void(toggle(@message.message_id@))"><img src="/resources/forums/Collapse16.gif" width="16" height="16" alt="+" /></a>
   </div>
   <if @display_subject_p@ true>
     <if @preview@ nil>
Index: openacs-4/packages/forums/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/forums/tcl/messages-procs.tcl	13 Jan 2005 13:58:16 -0000	1.30
+++ openacs-4/packages/forums/tcl/messages-procs.tcl	26 Mar 2005 20:29:20 -0000	1.31
@@ -184,11 +184,15 @@
         set query select_message_with_attachment
     }
 
-    db_1row $query {} -column_array row
-
-    # Convert to user's date/time format
-    set row(posting_date_ansi) [lc_time_system_to_conn $row(posting_date_ansi)]
-    set row(posting_date_pretty) [lc_time_fmt $row(posting_date_ansi) "%x %X"]
+    if {![db_0or1row $query {} -column_array row]} {
+        if {[array exists row]} {
+            array unset row
+        }
+    } else {
+        # Convert to user's date/time format
+        set row(posting_date_ansi) [lc_time_system_to_conn $row(posting_date_ansi)]
+        set row(posting_date_pretty) [lc_time_fmt $row(posting_date_ansi) "%x %X"]
+    }
 }
 
 ad_proc -private forum::message::set_state {
Index: openacs-4/packages/forums/www/message-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/forums/www/message-view.tcl	15 Mar 2005 20:06:45 -0000	1.31
+++ openacs-4/packages/forums/www/message-view.tcl	26 Mar 2005 20:29:20 -0000	1.32
@@ -19,6 +19,10 @@
 
 # Load up the message information
 forum::message::get -message_id $message_id -array message
+if {![array exists message]} {
+    ns_returnnotfound
+    ad_script_abort
+}
 
 # Load up the forum information
 forum::get -forum_id $message(forum_id) -array forum