diff --git a/.hgtags b/.hgtags
index 6990d96f71b81d7c27d2dbe2244580e4caf1b402..6ce4620aaa848a58698944a0a56bddbb89688d9b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -43,3 +43,4 @@ f944e71e243fc3fd4b9af3538049373e7eb692b0 OpenOLAT 8.3.5
 6e636da488eacb07dbe681fb00922a8ed1b54eb9 OpenOLAT 8.4.0beta
 c7d08eee4220f425bd2aaf354e985f366840fa8d OpenOLAT 8.4.0
 d648ff338d691e8eac01c4d6ac37c538078fa8b1 OpenOLAT 8.4.1
+963709c2ffb3667c9cc497c9dd0ad04de426d90a OpenOLAT 8.4.2
diff --git a/src/main/java/org/olat/core/util/mail/manager/MailManager.java b/src/main/java/org/olat/core/util/mail/manager/MailManager.java
index d1fea460f44e26e61c81cd73f685f72cb3d9bc62..ba2c1ad52cf43fdf98121c293a3d47182e214f4e 100644
--- a/src/main/java/org/olat/core/util/mail/manager/MailManager.java
+++ b/src/main/java/org/olat/core/util/mail/manager/MailManager.java
@@ -519,7 +519,8 @@ public class MailManager extends BasicManager {
 		StringBuilder sb = new StringBuilder();
 		String fetchOption = (fetchRecipients != null && fetchRecipients.booleanValue()) ? "fetch" : "";
 		sb.append("select mail from ").append(DBMailLightImpl.class.getName()).append(" mail")
-			.append(" inner join ").append(fetchOption).append(" mail.recipients recipient")
+			.append(" inner join fetch ").append(" mail.from fromRecipient")
+		  .append(" inner join ").append(fetchOption).append(" mail.recipients recipient")
 			.append(" inner join ").append(fetchOption).append(" recipient.recipient recipientIdentity")
 			.append(" where recipientIdentity.key=:recipientKey and recipient.deleted=false");
 		if(unreadOnly != null && unreadOnly.booleanValue()) {
diff --git a/src/main/java/org/olat/course/assessment/EfficiencyStatementManager.java b/src/main/java/org/olat/course/assessment/EfficiencyStatementManager.java
index ea2e5e7e107edaf1f600c7ec02b1d8d76693d842..c03e1e59ba2947acd3405e70a2faa289cfc858da 100644
--- a/src/main/java/org/olat/course/assessment/EfficiencyStatementManager.java
+++ b/src/main/java/org/olat/course/assessment/EfficiencyStatementManager.java
@@ -450,6 +450,7 @@ public class EfficiencyStatementManager extends BasicManager implements UserData
 		try {
 			StringBuilder sb = new StringBuilder();
 			sb.append("select statement from ").append(UserEfficiencyStatementLight.class.getName()).append(" as statement ")
+				.append(" left join fetch statement.resource resource")
 			  .append(" where statement.identity.key=:identityKey");
 
 			return dbInstance.getCurrentEntityManager()