diff --git a/tasklist/src/plugin-resources/templates/tasklist.vm b/tasklist/src/plugin-resources/templates/tasklist.vm
index 9b54891f..3ad137c7 100644
--- a/tasklist/src/plugin-resources/templates/tasklist.vm
+++ b/tasklist/src/plugin-resources/templates/tasklist.vm
@@ -11,18 +11,27 @@
       <p>
           #foreach ($class in $docInfo.classes)
             #set ($todoTags = $class.getTags("@todo"))
-            #if ($todoTags.size() > 0 )
+            #set ($hasToDoMethod = false)
+            #foreach ($m in $class.methods)
+              #set ($methodTodoTags = $m.getTags("@todo"))
+              #if ($methodTodoTags.size() > 0)
+                #set ($hasToDoMethod = true)
+              #end
+            #end
+            #if ($todoTags.size() > 0 || $hasToDoMethod)
               <subsection name="$class.name">
-                <table>
-                  <th>Class Todos</th>
-                  #foreach ($tag in $todoTags)
-                  <tr>
-                    <td>
-                      $tag.value
-                    </td>
-                  </tr>
-                  #end
-                </table>
+                #if ($todoTags.size() > 0)
+                  <table>
+                    <th>Class Todos</th>
+                    #foreach ($tag in $todoTags)
+                    <tr>
+                      <td>
+                        $tag.value
+                      </td>
+                    </tr>
+                    #end
+                  </table>
+                #end
               
                 #foreach ($m in $class.methods)
                   #set ($methodTodoTags = $m.getTags("@todo"))