diff --git a/mod/forum/index.php b/mod/forum/index.php
index 1013f205111..08f673b1212 100644
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -128,8 +128,6 @@
 
             if ($CFG->forum_trackreadposts) {
                 $groupid = ($groupmode==SEPARATEGROUPS && !isteacheredit($course->id)) ? $currentgroup : false;
-//                $unread = forum_tp_count_forum_posts($forum->id, $groupid) -
-//                          forum_tp_count_forum_read_records($USER->id, $forum->id, $groupid);
                 $unread = forum_tp_count_forum_unread_posts($USER->id, $forum->id, $groupid);
                 if ($unread > 0) {
                     $unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>';
@@ -253,13 +251,11 @@
 
                 if ($CFG->forum_trackreadposts) {
                     $groupid = ($groupmode==SEPARATEGROUPS && !isteacheredit($course->id)) ? $currentgroup : false;
-//                    $unread = forum_tp_count_forum_posts($forum->id, $groupid) -
-//                              forum_tp_count_forum_read_records($USER->id, $forum->id, $groupid);
                     $unread = forum_tp_count_forum_unread_posts($USER->id, $forum->id, $groupid);
                     if ($unread > 0) {
-                        $unreadlink = '<span class="unread">'.$unread.'</span>';
+                        $unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>';
                     } else {
-                        $unreadlink = '<span class="read">'.$unread.'</span>';
+                        $unreadlink = '<span class="read"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>';
                     }
                 }