Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
===================================================================
diff -u -rc908ebed08eb519235a7b4e2866e58b630962efa -rb5c79ac2cac72eb7a817bc958d13f8927c962551
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java	(.../GradebookMonitoringAction.java)	(revision c908ebed08eb519235a7b4e2866e58b630962efa)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java	(.../GradebookMonitoringAction.java)	(revision b5c79ac2cac72eb7a817bc958d13f8927c962551)
@@ -50,6 +50,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -308,7 +309,8 @@
 
 		if (lesson != null) {
 			String fileName = lesson.getLessonName().replaceAll(" ", "_") + ".xlsx";
-
+			fileName  = FileUtil.encodeFilenameForDownload(request, fileName);
+			
 			response.setContentType("application/x-download");
 			response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
 			logger.debug("Exporting to a spreadsheet gradebook lesson: " + lessonID);
@@ -358,6 +360,8 @@
 	dataToExport.put(gradebookService.getMessage("gradebook.exportcourse.course.summary"), summaryData);
 
 	String fileName = organisation.getName().replaceAll(" ", "_") + ".xls";
+	fileName  = FileUtil.encodeFilenameForDownload(request, fileName);
+	
 	response.setContentType("application/x-download");
 	response.setHeader("Content-Disposition", "attachment;filename=" + fileName);