diff --git a/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties
index d7f78427fcac826bd032e78dc412fdb0fb153af4..a0dce2a60f869949072fe08acc7e6ef3e4291e67 100644
--- a/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties
@@ -169,7 +169,7 @@ contact.body=$org.olat.modules.co\:contact.body
 contact.cp.from=$org.olat.modules.co\:contact.cp.from
 contact.from=$org.olat.modules.co\:contact.from
 contact.to=$org.olat.modules.co\:contact.to
-contact.to.owner=Alle Kurzbesitzer
+contact.to.owner=Alle Kursbesitzer
 contact.to.coach=Alle Betreuer
 contact.to.participant=Alle Teilnehmer
 contact.subject=$org.olat.modules.co\:contact.subject
diff --git a/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
index ab778c9684cd0ff8bc97518ebe5294e001abdc92..9c5bfa91b22df58f3cb29dfa50e35b758d4f1b7d 100644
--- a/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
@@ -165,9 +165,9 @@ contact.body=$org.olat.modules.co\:contact.body
 contact.cp.from=$org.olat.modules.co\:contact.cp.from
 contact.from=$org.olat.modules.co\:contact.from
 contact.to=$org.olat.modules.co\:contact.to
-contact.to.owner=Alle Kurzbesitzer
-contact.to.coach=Alle Betreuer
-contact.to.participant=Alle Teilnehmer
+contact.to.owner=All course owners
+contact.to.coach=All coaches
+contact.to.participant=All participants
 contact.subject=$org.olat.modules.co\:contact.subject
 copy.suffix=(copy)
 course.config.changed.text=You want to modify your course settings. When clicking on 'Yes' {0} participants will have to restart this course. When clicking on 'No' all modifications will be discarded. Do you wish to proceed?
@@ -341,6 +341,7 @@ menu.repository.admin.alt=$\:menu.repository.admin
 message.entry.selected=Learning resource "{0}" with type "{1}" allocated successfully.
 month=Month
 msg.warnusers=(There are {0} users currently using this resource)
+msg.send.ok=$org.olat.modules.co\:msg.send.ok
 my.course.comment.enabled=Comments in "Course"
 my.course.rating.enabled=Rating in "Course"
 my.course.search.enabled=Search in "Course"
diff --git a/src/main/java/org/olat/repository/ui/author/SendMailController.java b/src/main/java/org/olat/repository/ui/author/SendMailController.java
index f6875fe5c5d6f069c07e0ca783d9aa1d15f00627..568791016d6569802f8e797a490e604aff379892 100644
--- a/src/main/java/org/olat/repository/ui/author/SendMailController.java
+++ b/src/main/java/org/olat/repository/ui/author/SendMailController.java
@@ -268,7 +268,10 @@ public class SendMailController extends FormBasicController {
 			boolean success = false;
 			try {
 				File[] attachmentArr = getAttachments();
-				MailContext context = new MailContextImpl(getWindowControl().getBusinessControl().getAsString());
+				MailContext context = null;
+				if(repoEntries.size() == 1) {
+					context = new MailContextImpl("[RepositoryEntry:" + repoEntries.get(0).getKey() + "]");
+				}
 				MailBundle bundle = new MailBundle();
 				bundle.setContext(context);
 				bundle.setFromId(getIdentity());