Index: openacs-4/packages/attachments/tcl/attachments-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/tcl/attachments-procs.tcl,v
diff -u -N -r1.12 -r1.12.6.1
--- openacs-4/packages/attachments/tcl/attachments-procs.tcl	24 Nov 2003 14:50:34 -0000	1.12
+++ openacs-4/packages/attachments/tcl/attachments-procs.tcl	10 Dec 2005 11:56:45 -0000	1.12.6.1
@@ -148,7 +148,7 @@
             if { [content_extlink::extlink_p -item_id $item_id] } {
               set label [content_extlink::extlink_name -item_id $item_id]
             } else {
-              set label [fs::get_object_name -object_id $item_id]
+              set label [fs::get_object_prettyname -object_id $item_id]
             }
             set append_lst [list [goto_attachment_url -object_id $object_id -attachment_id $item_id -base_url $base_url]]
             lappend lst_with_urls [concat [list $item_id $label] $append_lst]
Index: openacs-4/packages/attachments/www/attach.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.adp,v
diff -u -N -r1.9 -r1.9.2.1
--- openacs-4/packages/attachments/www/attach.adp	29 Jun 2004 10:17:47 -0000	1.9
+++ openacs-4/packages/attachments/www/attach.adp	10 Dec 2005 11:56:47 -0000	1.9.2.1
@@ -69,7 +69,8 @@
 <else>
       <td><img src="graphics/file.gif"></td>
       <td>
-        @contents.name@
+      <if @contents.title@ eq nil>@contents.name@</if>
+      <else>@contents.title@</else>
 <if @contents.new_p@>
         (&nbsp;new&nbsp;)
 </if>
Index: openacs-4/packages/attachments/www/attach.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.xql,v
diff -u -N -r1.1 -r1.1.12.1
--- openacs-4/packages/attachments/www/attach.xql	17 Sep 2002 21:08:38 -0000	1.1
+++ openacs-4/packages/attachments/www/attach.xql	10 Dec 2005 11:56:47 -0000	1.1.12.1
@@ -4,6 +4,7 @@
     <fullquery name="select_folder_contents">
         <querytext>
             select  fs_objects.object_id,
+                         fs_objects.title,
                          fs_objects.name,
                          fs_objects.live_revision,
                          fs_objects.type,