Index: webfm_driver.inc
===================================================================
--- webfm_driver.inc	(revision 138)
+++ webfm_driver.inc	(working copy)
@@ -39,7 +39,7 @@
  */
 function search_attachments_get_webfm_file($fid) {
   // Select the file's file name, link and size, and use stat to get last modified time
-  $result = db_query('SELECT fname, fsize FROM {webfm_file} WHERE fid = %d', $fid);
+  $result = db_query('SELECT fpath, fsize, ftitle FROM {webfm_file} WHERE fid = %d', $fid);
   $file = db_fetch_object($result);
   $info = array();    
 	global $base_url;
@@ -47,7 +47,7 @@
 	$stats = stat($file->fpath);
 	$info['mtime'] = $stats['mtime'];
 	$info['url'] = $base_url . '/?q=webfm_send/' . $fid;
-	$info['name'] = $file->fname;
+	$info['name'] = $file->ftitle .' ['. basename($file->fpath) .']';
 	$info['size'] = $file->fsize;
   $info['nid'] = search_attachments_get_webfm_file_nids($fid);
   return $info;