diff --git a/templates/widgets/gradingSummary.hamlet b/templates/widgets/gradingSummary.hamlet
index f72c1edd9..a1c62237c 100644
--- a/templates/widgets/gradingSummary.hamlet
+++ b/templates/widgets/gradingSummary.hamlet
@@ -22,14 +22,9 @@ $# --
         $maybe _ <- hasPoints
           <td .table__td colspan=2>
         <td .table__td>#{display nrNoGrade}
-  $# TODO: for Steffen: show messages conditional upon table content
   $maybe _ <- positiveSum $ bonusSummary ^. _numSheets
     <p>_{MsgSheetTypeInfoBonus}
+      $maybe _ <- positiveSum =<< (bonusSummary ^. _achievedPoints)
+        _{MsgSheetGradingBonusIncluded}
+  $maybe _ <- positiveSum $ informationalSummary ^. _numSheets
     <p>_{MsgSheetTypeInfoNotGraded}
-    $maybe _ <- positiveSum =<< (bonusSummary ^. _achievedPoints)
-      <p>_{MsgSheetGradingBonusIncluded}
-  $nothing
-    $#TODO: MsgSheetTypeInfo into part about Bonus and about Informational
-    $maybe _ <- positiveSum $ informationalSummary ^. _numSheets
-      <p>_{MsgSheetTypeInfoBonus}
-      <p>_{MsgSheetTypeInfoNotGraded}
\ No newline at end of file