diff --git a/refilc/lib/helpers/notification_helper.dart b/refilc/lib/helpers/notification_helper.dart
index 9ee1a49..1959866 100644
--- a/refilc/lib/helpers/notification_helper.dart
+++ b/refilc/lib/helpers/notification_helper.dart
@@ -22,7 +22,7 @@ import 'package:intl/intl.dart';
 import 'package:refilc_kreta_api/models/message.dart';
 
 // if you want to add a new category, also add it to the DB or else the app will probably crash
-enum LastSeenCategory { 
+enum LastSeenCategory {
   grade,
   surprisegrade,
   absence,
@@ -655,7 +655,7 @@ nem lesz tőle használhatatlan az app, de kikommenteltem, mert még a végén k
                         lesson.lessonIndex,
                         lesson.name,
                         dayTitle(lesson.date),
-                        lesson.substituteTeacher!.isRenamed
+                        (lesson.substituteTeacher?.isRenamed ?? false)
                             ? lesson.substituteTeacher!.renamedTo!
                             : lesson.substituteTeacher!.name
                       ],
diff --git a/refilc_mobile_ui/lib/screens/navigation/navigation_route_handler.dart b/refilc_mobile_ui/lib/screens/navigation/navigation_route_handler.dart
index 7c06e1f..f741d4c 100644
--- a/refilc_mobile_ui/lib/screens/navigation/navigation_route_handler.dart
+++ b/refilc_mobile_ui/lib/screens/navigation/navigation_route_handler.dart
@@ -2,6 +2,7 @@
 import 'package:refilc_mobile_ui/pages/absences/absences_page.dart';
 import 'package:refilc_mobile_ui/pages/grades/grades_page.dart';
 import 'package:refilc_mobile_ui/pages/home/home_page.dart';
+import 'package:refilc_mobile_ui/pages/messages/messages_page.dart';
 import 'package:refilc_mobile_ui/pages/notes/notes_page.dart';
 // import 'package:refilc_mobile_ui/pages/messages/messages_page.dart';
 import 'package:refilc_mobile_ui/pages/timetable/timetable_page.dart';
@@ -20,8 +21,8 @@ Route navigationRouteHandler(RouteSettings settings) {
       return navigationPageRoute((context) => const NotesPage());
     case "absences":
       return navigationPageRoute((context) => const AbsencesPage());
-    // case "messages":
-    //   return navigationPageRoute((context) => const MessagesPage());
+    case "messages":
+      return navigationPageRoute((context) => const MessagesPage());
     // case "absences":
     //   return navigationPageRoute((context) => const AbsencesPage());
     default: