diff --git a/db/messages.php b/db/messages.php
index 939326cb30eef65779e9b8687a5af6711d2b238a..7f888dad53f479ea759addff0bd4ed7aa24d49b2 100644
--- a/db/messages.php
+++ b/db/messages.php
@@ -20,7 +20,7 @@
  *
  * @package   mod_pdfannotator
  * @copyright 2018 RWTH Aachen (see README.md)
- * @authors   Rabea de Groot and Anna Heynkes
+ * @authors   Rabea de Groot, Anna Heynkes and Friederike Schwager
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  *
  */
@@ -35,10 +35,6 @@ $messageproviders = array (
     // Concerns answers to questions the student subscribed to.
     'newanswer' => array (
         'capability'  => 'mod/pdfannotator:viewanswers', // Student capability.
-        'defaults' => array(
-            'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_LOGGEDIN + MESSAGE_DEFAULT_LOGGEDOFF,
-            'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_LOGGEDIN + MESSAGE_DEFAULT_LOGGEDOFF,
-        )
     ),
 
     // Notify teacher about a newly reported comment.
@@ -48,11 +44,7 @@ $messageproviders = array (
 
     // Notify when receiving a forwarded question.
     'forwardedquestion' => array (
-        'capability'  => 'mod/pdfannotator:getforwardedquestions',
-        'defaults' => array(
-            'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_LOGGEDIN + MESSAGE_DEFAULT_LOGGEDOFF,
-            'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_LOGGEDIN + MESSAGE_DEFAULT_LOGGEDOFF,
-        )
+        'capability'  => 'mod/pdfannotator:getforwardedquestions', // Teacher capability.
     )
 
 );
\ No newline at end of file