diff --git a/src/main/java/org/olat/modules/grading/ui/GradingAssignmentsListController.java b/src/main/java/org/olat/modules/grading/ui/GradingAssignmentsListController.java
index 72f6b3fd244ec91740b78d10b5e7ae3acad9512e..5fbc7a45689eee68287af7e1d082fd6938a4ae4b 100644
--- a/src/main/java/org/olat/modules/grading/ui/GradingAssignmentsListController.java
+++ b/src/main/java/org/olat/modules/grading/ui/GradingAssignmentsListController.java
@@ -69,6 +69,7 @@ import org.olat.core.id.Identity;
 import org.olat.core.id.Roles;
 import org.olat.core.id.context.ContextEntry;
 import org.olat.core.id.context.StateEntry;
+import org.olat.core.util.FileUtils;
 import org.olat.core.util.StringHelper;
 import org.olat.core.util.mail.ContactList;
 import org.olat.core.util.mail.ContactMessage;
@@ -716,6 +717,9 @@ public class GradingAssignmentsListController extends FormBasicController implem
 			for(GradingAssignment assignment:assignments) {
 				gradingService.assignGrader(assignment, assignGrader.getGrader(), sendTemplate, result);
 			}
+			if(mailTemplate.getAttachmentsTmpDir() != null) {
+				FileUtils.deleteDirsAndFiles(mailTemplate.getAttachmentsTmpDir(), true, true);
+			}
 			return StepsMainRunController.DONE_MODIFIED;
 		};
 		
@@ -760,6 +764,9 @@ public class GradingAssignmentsListController extends FormBasicController implem
 				GradingAssignment unassignedAssignment = gradingService.unassignGrader(assignment);
 				gradingService.assignGrader(unassignedAssignment, assignGrader.getGrader(), sendTemplate, result);
 			}
+			if(mailTemplate.getAttachmentsTmpDir() != null) {
+				FileUtils.deleteDirsAndFiles(mailTemplate.getAttachmentsTmpDir(), true, true);
+			}
 			return StepsMainRunController.DONE_MODIFIED;
 		};
 		
diff --git a/src/main/java/org/olat/modules/grading/ui/wizard/AssignGrader1ChooseMemberStep.java b/src/main/java/org/olat/modules/grading/ui/wizard/AssignGrader1ChooseMemberStep.java
index 8e9e6720cf04c91514be60359a517b21c5b9eac6..9a9f876ad4400729c68685b4a00f9bfbaf1c14c8 100644
--- a/src/main/java/org/olat/modules/grading/ui/wizard/AssignGrader1ChooseMemberStep.java
+++ b/src/main/java/org/olat/modules/grading/ui/wizard/AssignGrader1ChooseMemberStep.java
@@ -52,6 +52,7 @@ public class AssignGrader1ChooseMemberStep extends BasicStep {
 
 	@Override
 	public StepFormController getStepController(UserRequest ureq, WindowControl wControl, StepsRunContext runContext, Form form) {
+		form.setMultipartEnabled(true);
 		return new AssignGraderBySearchController(ureq, wControl, assignGrader, form, runContext);
 	}
 
diff --git a/src/main/java/org/olat/modules/grading/ui/wizard/AssignGrader3MailStep.java b/src/main/java/org/olat/modules/grading/ui/wizard/AssignGrader3MailStep.java
index 9906bef6992b52680803cbe3179d4dd32215eaf4..1294705a53d690b277d4d0a0af5fe20594d8a921 100644
--- a/src/main/java/org/olat/modules/grading/ui/wizard/AssignGrader3MailStep.java
+++ b/src/main/java/org/olat/modules/grading/ui/wizard/AssignGrader3MailStep.java
@@ -55,6 +55,7 @@ public class AssignGrader3MailStep extends BasicStep {
 	public StepFormController getStepController(UserRequest ureq, WindowControl wControl, StepsRunContext runContext, Form form) {
 		ContactList contacts = new ContactList(getTranslator().translate("assign.grader.contact"));
 		contacts.add(assignGrader.getGrader());
+		form.setMultipartEnabled(true);
 		return new ImportGraderMailController(ureq, wControl, mailTemplate, contacts, assignGrader, form, runContext);
 	}
 }
\ No newline at end of file