diff --git a/src/components/history-list.vue b/src/components/history-list.vue
index b97f0d7..24e4758 100644
--- a/src/components/history-list.vue
+++ b/src/components/history-list.vue
@@ -44,9 +44,10 @@ const chars = {
           <span class="text" v-else
             >{{
               $t(getSubstitutionText(event.change), {
-                subject: event.change.subject,
+                subject: event.change.change.subject,
                 class: event.change.class.join(", "),
-                teacher: event.change.change.teacher || event.change.teacher,
+                teacher: event.change.teacher,
+                new_teacher: event.change.change.teacher,
                 room: event.change.change.room,
               })
             }}<span class="notes" v-if="event.change.notes">
diff --git a/src/components/substitution-list.vue b/src/components/substitution-list.vue
index 21b1e97..a810793 100644
--- a/src/components/substitution-list.vue
+++ b/src/components/substitution-list.vue
@@ -23,7 +23,8 @@ const substitutionsForDate = computed(() => {
           $t(getSubstitutionText(substitution), {
             subject: substitution.change.subject,
             class: substitution.class.join(", "),
-            teacher: substitution.change.teacher || substitution.teacher,
+            teacher: substitution.teacher,
+            new_teacher: substitution.change.teacher,
             room: substitution.change.room,
           })
         }}</span>
diff --git a/src/strings.js b/src/strings.js
index 83dc8a2..db6c1bd 100644
--- a/src/strings.js
+++ b/src/strings.js
@@ -62,17 +62,16 @@ export const strings = {
       text: {
         withClass: {
           subjectChange:
-            "Lesson changed for {class} in {subject} with {teacher} in room {room}",
-          teacherChange: "Lesson for {class} in {subject} now with {teacher}",
-          roomChange:
-            "Room for lesson {subject} for {class} with {teacher} is now {room}",
+            "Lesson for {class} in {subject} with {teacher} now in room {room}",
+          teacherChange:
+            "Lesson for {class} in {subject} with {teacher} now with {new_teacher} in room {room}",
           cancellation: "Lesson for {class} with {teacher} is cancelled",
         },
         withoutClass: {
           subjectChange:
-            "Lesson changed in {subject} with {teacher} in room {room}",
-          teacherChange: "Lesson in {subject} now with {teacher}",
-          roomChange: "Room for lesson {subject} with {teacher} is now {room}",
+            "Lesson in {subject} with {teacher} now in room {room}",
+          teacherChange:
+            "Lesson in {subject} with {teacher} now with {new_teacher} in room {room}",
           cancellation: "Lesson with {teacher} is cancelled",
         },
       },
@@ -141,19 +140,17 @@ export const strings = {
       text: {
         withClass: {
           subjectChange:
-            "Unterricht geändert für die Klasse {class} in {subject} mit {teacher} in Raum {room}",
+            "Unterricht für die Klasse {class} im Fach {subject} mit {teacher} jetzt in Raum {room}",
           teacherChange:
-            "Unterricht geändert für die Klasse {class} in {subject} jetzt mit {teacher}",
-          roomChange:
-            "Der Raum für das Fach {subject} für die Klasse {class} mit {teacher} ist jetzt {room}",
-          cancellation: "Unterricht für Klasse {class} mit {teacher} fällt aus",
+            "Unterricht für die Klasse {class} im Fach {subject} mit {teacher} jetzt mit {new_teacher} in Raum {room}",
+          cancellation:
+            "Unterricht für die Klasse {class} mit {teacher} fällt aus",
         },
         withoutClass: {
           subjectChange:
-            "Unterricht geändert in {subject} mit {teacher} in Raum {room}",
-          teacherChange: "Unterricht in {subject} jetzt mit {teacher}",
-          roomChange:
-            "Raum für das Fach {subject} mit {teacher} ist jetzt {room}",
+            "Unterricht im Fach {subject} mit {teacher} jetzt in Raum {room}",
+          teacherChange:
+            "Unterricht im Fach {subject} mit {teacher} jetzt mit {new_teacher} in Raum {room}",
           cancellation: "Unterricht mit {teacher} fällt aus",
         },
       },
diff --git a/src/util.js b/src/util.js
index 2bce7b3..f5bd2ba 100644
--- a/src/util.js
+++ b/src/util.js
@@ -6,7 +6,14 @@ export function getSubstitutionText(substitution) {
 
   // TODO: implement more texts
   if (substitution.type == "change") {
-    return `substitution.text.${includeClassValue}.subjectChange`;
+    if (
+      substitution.teacher == substitution.change.teacher ||
+      !substitution.change.teacher
+    ) {
+      return `substitution.text.${includeClassValue}.subjectChange`;
+    } else {
+      return `substitution.text.${includeClassValue}.teacherChange`;
+    }
   } else if (substitution.type == "cancellation") {
     return `substitution.text.${includeClassValue}.cancellation`;
   }