diff --git a/mod/dialogue/index.php b/mod/dialogue/index.php
old mode 100644
new mode 100755
index 7c0c391..2305782
--- a/mod/dialogue/index.php
+++ b/mod/dialogue/index.php
@@ -31,7 +31,7 @@
         die;
     }
 
-    $hascapviewany = has_capability('mod/dialogue:viewany', get_context_instance(CONTEXT_COURSE, $course->id));
+    $hascapviewall = has_capability('mod/dialogue:viewall', get_context_instance(CONTEXT_COURSE, $course->id));
     
     $timenow = time();
 
@@ -44,7 +44,7 @@
            error("Course Module ID was incorrect");
        }
        $table->data[] = array ("<a href=\"view.php?id=$cm->id\">$dialogue->name</a>",
-                dialogue_count_open($dialogue, $USER), dialogue_count_closed($dialogue, $USER, $hascapviewany));
+                dialogue_count_open($dialogue, $USER), dialogue_count_closed($dialogue, $USER, $hascapviewall));
     }
     echo "<br />";
     print_table($table);
diff --git a/mod/dialogue/lib.php b/mod/dialogue/lib.php
old mode 100644
new mode 100755
index 6f086ef..11d6e53
--- a/mod/dialogue/lib.php
+++ b/mod/dialogue/lib.php
@@ -438,7 +438,7 @@ function dialogue_delete_expired_conversations() {
            if ($dialogue->deleteafter) {
                $expirytime = time() - $dialogue->deleteafter * 86400;
                if ($conversations = get_records_select("dialogue_conversations",
-                   "timemodified < $expirytime AND closed = 1")) {
+                   "(timemodified < $expirytime) AND (dialogueid = " . $dialogue->id  . ") AND (closed = 1)")) {
                    echo "\nDeleting expired conversations for Dialogue id " . $dialogue->id; 
                    foreach ($conversations as $conversation) {
                        delete_records("dialogue_conversations", "id", $conversation->id, "dialogueid", $dialogue->id);
@@ -498,7 +498,7 @@ function dialogue_get_conversations($dialogue, $user, $condition = '', $order =
     	$whereuser = ' AND (c.userid = '.$user->id.' OR c.recipientid = '.$user->id.') ';
     }
     
-    $sql  = "SELECT c.*, COUNT(e.id) AS total, COUNT(r.id) as read ";
+    $sql  = "SELECT c.*, COUNT(e.id) AS total, COUNT(r.id) as readings ";
     $sql .= "FROM {$CFG->prefix}dialogue_conversations c ";
     $sql .= "LEFT JOIN {$CFG->prefix}dialogue_entries e ON e.conversationid = c.id ";
     $sql .= "LEFT JOIN {$CFG->prefix}dialogue_read r ON r.entryid = e.id AND r.userid = $user->id ";
diff --git a/mod/dialogue/locallib.php b/mod/dialogue/locallib.php
old mode 100644
new mode 100755
index 9e00d23..3af2c59
--- a/mod/dialogue/locallib.php
+++ b/mod/dialogue/locallib.php
@@ -465,8 +465,8 @@ function dialogue_list_conversations($dialogue) {
         foreach ($names as $cid=>$name) {
             $conversation = $conversations[$cid];
            
-            if ($conversation->total-$conversation->read > 0) {
-                $unread = '<span class="unread">'.($conversation->total-$conversation->read).'</span>';
+            if ($conversation->total-$conversation->readings > 0) {
+                $unread = '<span class="unread">'.($conversation->total-$conversation->readings).'</span>';
             } else {
                 $unread = 0;
             }
diff --git a/mod/dialogue/version.php b/mod/dialogue/version.php
old mode 100644
new mode 100755
index 0574c11..a06aa79
--- a/mod/dialogue/version.php
+++ b/mod/dialogue/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2007121701;
+$module->version  = 2008061601;
 $module->requires = 2007092500;  // Requires this Moodle version
 $module->cron     = 60;
 
diff --git a/mod/dialogue/view.php b/mod/dialogue/view.php
old mode 100644
new mode 100755
index 0536828..38fb732
--- a/mod/dialogue/view.php
+++ b/mod/dialogue/view.php
@@ -28,7 +28,7 @@
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     $hascapopen = has_capability('mod/dialogue:open', $context);
     $hascapparticipate = has_capability('mod/dialogue:participate', $context);
-    $hascapviewany = has_capability('mod/dialogue:viewany', $context);
+    $hascapviewall = has_capability('mod/dialogue:viewall', $context);
 
     add_to_log($course->id, "dialogue", "view", "view.php?id=$cm->id", $dialogue->id, $cm->id);
 
@@ -80,7 +80,7 @@
         echo "<br />";
         // get some stats
 
-        $countclosed = dialogue_count_closed($dialogue, $USER, $hascapviewany);
+        $countclosed = dialogue_count_closed($dialogue, $USER, $hascapviewall);
 
         // set the default pane if not specified 
         if ($params->pane<0) {