Index: openacs-4/packages/forums/lib/message/row-minimal.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/Attic/row-minimal.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/lib/message/row-minimal.adp	27 Jan 2005 22:24:07 -0000	1.1
+++ openacs-4/packages/forums/lib/message/row-minimal.adp	28 Jan 2005 11:01:42 -0000	1.2
@@ -6,22 +6,22 @@
     </if>
 
     <div style="left">
-    <if @display_subject_p@ true>
-      <if @preview@ nil>
-        <a href="@message.direct_url@" title="Direct link to this post" class="reference">@message.number@</a>:
-        <a class="title" href="message-view?message_id=@message.message_id@" title="Link to this post on a separate page">@message.subject@</a>
+      <if @display_subject_p@ true>
+        <if @preview@ nil>
+          <a href="@message.direct_url@" title="Direct link to this post" class="reference">@message.number@</a>:
+          <a class="title" href="message-view?message_id=@message.message_id@" title="Link to this post on a separate page">@message.subject@</a>
+        </if>
+        <else>
+          @message.subject@
+        </else>
       </if>
       <else>
-        @message.subject@
-      </else>
-    </if>
-    <else>
         <a href="@message.direct_url@" title="Direct link to this post" class="reference">@message.number@</a>
-    </else>
+      </else>
 
-    <if @message.parent_number@ not nil>
-      <span class="response">(response to <a href="@message.parent_direct_url@" class="reference">@message.parent_number@</a>)</span>
-    </if>
+      <if @message.parent_number@ not nil>
+        <span class="response">(response to <a href="@message.parent_direct_url@" class="reference">@message.parent_number@</a>)</span>
+      </if>
     </div>
 
     <div style="right">
@@ -49,19 +49,17 @@
     <div style="clear:both;"></div>
 
     <if @rownum@ eq 0>
+  </div>
+  </if>    
+  <div class="content">
+    @message.content;noquote@
+    <if @message.n_attachments@ not nil and @message.n_attachments@ gt 0>
+      <div class="attachments">
+        #forums.Attachments#
+        <include src="/packages/forums/lib/message/attachment-list" &message="message">
       </div>
-      <div class="content">
-	@message.content;noquote@	
-      <if @message.n_attachments@ not nil and @message.n_attachments@ gt 0>
-        <div class="attachments">
-          #forums.Attachments#
-          <include src="/packages/forums/lib/message/attachment-list" &message="message">
-        </div>
-      </if>
+    </if>
 
-      <br /> 
-  
-
     <div class="attribution">#forums.Posted_by# <a href="user-history?user_id=@message.user_id@">@message.user_name@</a> on <span class="post-date">@message.posting_date_pretty@</span></div>
 
   </div>
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.3 -r1.4
--- openacs-4/packages/forums/lib/message/row.adp	27 Jan 2005 16:08:31 -0000	1.3
+++ openacs-4/packages/forums/lib/message/row.adp	28 Jan 2005 11:01:42 -0000	1.4
@@ -56,10 +56,12 @@
 
         <div class="content">
           @message.content;noquote@
-          <div class="attachments">
-            #forums.Attachments#
-            <include src="attachment-list" &message="message">
-          </div>
+          <if @message.n_attachments@ not nil and @message.n_attachments@ gt 0>
+            <div class="attachments">
+              #forums.Attachments#
+              <include src="attachment-list" &message="message">
+            </div>
+          </if>
           <div class="attribution">#forums.Posted_by# <a href="user-history?user_id=@message.user_id@">@message.user_name@</a> on <span class="post-date">@message.posting_date_pretty@</span></div>
           <if @message.max_child_sortkey@ ne "">
             <a href="javascript:void(toggleList(replies[@message.message_id@],1))"><img src=/resources/forums/ExpandAll16.gif width=16 height=16 ALT=+ border=0 title="Expand all replies to this post"></a>