--- block.module.original       2009-01-05 13:51:22.000000000 -0500
+++ block.module        2009-01-05 13:56:56.000000000 -0500
@@ -215,8 +215,10 @@ function block_block($op = 'list', $delt
       break;

     case 'view':
-      $block = db_fetch_object(db_query('SELECT body, format FROM {boxes} WHERE bid = %d', $delta));
+      $block = db_fetch_object(db_query('SELECT distinct title, body, format from {boxes} left join {blocks} b on boxes.bid = b.delta where module="block" and boxes.bid= %d',$delta));
       $data['content'] = check_markup($block->body, $block->format, FALSE);
+      $data['subject'] = check_plain($block->title);
+
       return $data;
   }
 }