diff --git a/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties b/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties
index 62d6ddca390..77551173dee 100644
--- a/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties
+++ b/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties
@@ -1,7 +1,7 @@
-raceInRegattaOfEvent=race {0} in regatta {1} of event {2}
-raceInFleetInRegattaOfEvent={0} ({3}) in regatta {1} of event {2}
+raceInRegattaOfEvent=race {0} in regatta '{1}' of event '{2}'
+raceInFleetInRegattaOfEvent=race {0} ({3}) in regatta '{1}' of event '{2}'
+leaderboardOfEvent=leaderboard '{0}' of event '{1}'
 
-leaderboardOfEvent=leaderboard {0} of event {1}
 leaderboardShowResultsLinkTitle=Show results
 racesOverviewLinkTitle=Show races overview
 raceboardShowRaceLinkTitle=Show race
@@ -25,6 +25,4 @@ competitorScoreCorrectionBody=New results for competitor {0} in {1} are availabl
 
 boatClassUpcomingRaceSubject=A race for boat class {0} will start soon
 # 0: boatClassName, 1: raceDescription, 2: time
-boatClassUpcomingRaceBody=A race for boat class {0} in {1} will start approximately at {2}.
-
-
+boatClassUpcomingRaceBody=For boat class {0} {1} will start approximately at {2}.
diff --git a/java/com.sap.sailing.server/resources/stringmessages/StringMessages_de.properties b/java/com.sap.sailing.server/resources/stringmessages/StringMessages_de.properties
index e69de29bb2d..ed499b011df 100644
--- a/java/com.sap.sailing.server/resources/stringmessages/StringMessages_de.properties
+++ b/java/com.sap.sailing.server/resources/stringmessages/StringMessages_de.properties
@@ -0,0 +1,28 @@
+raceInRegattaOfEvent=Wettfahrt {0} der Regatta "{1}" bei Veranstaltung "{2}"
+raceInFleetInRegattaOfEvent=Wettfahrt {0} ({3}) der Regatta "{1}" bei Veranstaltung "{2}"
+leaderboardOfEvent=Rangliste "{0}" bei Veranstaltung "{1}"
+
+leaderboardShowResultsLinkTitle=Ergebnisse anzeigen
+racesOverviewLinkTitle=Wettfahrtübersicht anzeigen
+raceboardShowRaceLinkTitle=Wettfahrt anzeigen
+raceboardRaceAnalysisLinkTitle=Wettfahrtanalyse anzeigen
+
+boatClassRaceFinishedSubject=Wettfahrt für Bootsklasse {0} beendet - Neue Ergebnisse verfügbar
+# 0: boatClassName, 1: raceDescription
+boatClassRaceFinishedBody=Neue Ergebnisse für Bootsklasse {0} in {1} sind verfügbar.
+
+boatClassScoreCorrectionSubject=Neue Ergebnisse für Bootsklasse {0} verfügbar
+# 0: boatClassName, 1: leaderboardDescription
+boatClassScoreCorrectionBody=Neue Ergebnisse für Bootsklasse {0} in {1} sind verfügbar.
+
+competitorPassesFinishSubject=Teilnehmer {0} hat eine Wettfahrt beendet
+# 0: competitorName, 1: raceDescription
+competitorPassesFinishBody=Teilnehmer {0} hat bei {1} die Ziellinie überquert.
+
+competitorScoreCorrectionSubject=Neue Ergebnisse für Teilnehmer {0}
+# 0: competitorName, 1: leaderboardDescription
+competitorScoreCorrectionBody=Für Teilnehmer {0} in {1} sind neue Ergebnisse verfügbar.
+
+boatClassUpcomingRaceSubject=Wettfahrt in Bootsklasse {0} startet bald
+# 0: boatClassName, 1: raceDescription, 2: time
+boatClassUpcomingRaceBody=In Bootsklasse {0} startet {1} um etwa {2}.
diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java
index c42fcd7673d..22e207a14b0 100644
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java
+++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java
@@ -314,7 +314,6 @@ public class SailingNotificationServiceImpl implements Stoppable, SailingNotific
                     return new NotificationMailTemplate(
                             messages.get(locale, "boatClassScoreCorrectionSubject", competitor.getName()), 
                             messages.get(locale, "boatClassScoreCorrectionBody", competitor.getName(), leaderboardDescription),
-                            createHomeLeaderboardLink(leaderboard, event, locale),
                             createHomeLeaderboardLink(leaderboard, event, locale));
                 }
             });