Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
===================================================================
diff -u -ref4ea7c43ef8851bb1810128fa9a80a9b5893b59 -r2a93774e4304f8bf15edfa234e95a67d8944c091
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java	(.../ExportDownloadServlet.java)	(revision ef4ea7c43ef8851bb1810128fa9a80a9b5893b59)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java	(.../ExportDownloadServlet.java)	(revision 2a93774e4304f8bf15edfa234e95a67d8944c091)
@@ -61,10 +61,12 @@
 	{
 	  	    
 	    String zipFilename = WebUtil.readStrParam(request, ExportPortfolioConstants.PARAM_FILE_LOCATION);
+	    zipFilename = new String(zipFilename.getBytes(), "UTF-8");
 	    
 	    /* Extract taken from org.lamsfoundation.lams.contentrepository.client.Download servlet */
 	    response.setContentType("application/x-download");
-		response.setHeader("Content-Disposition","attachment;filename=\""+getFilename(zipFilename)+"\"");
+	    String filename = FileUtil.encodeFilenameForDownload(request, getFilename(zipFilename));
+		response.setHeader("Content-Disposition","attachment;filename=\""+filename+"\"");
 		
 		InputStream in = new BufferedInputStream(new FileInputStream(new File(constructAbsolutePath(zipFilename)))); 
 		OutputStream out = response.getOutputStream();