Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java
===================================================================
diff -u -r41de4a8b5ff40c43e8eaadc76a33ebce112d6801 -rc2cc83cdd313c9082f3211aed42e36e3a65f50a1
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java	(.../Download.java)	(revision 41de4a8b5ff40c43e8eaadc76a33ebce112d6801)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java	(.../Download.java)	(revision c2cc83cdd313c9082f3211aed42e36e3a65f50a1)
@@ -288,10 +288,10 @@
 
 		if (saveFile) {
 		    log.debug("Sending as attachment");
-			response.setHeader("Content-Disposition","attachment;filename=" + filename);
+			response.setHeader("Content-Disposition","attachment;filename=\"" + filename+"\"");
 		} else {
 		    log.debug("Sending as inline");
-			response.setHeader("Content-Disposition","inline;filename=" + filename);
+			response.setHeader("Content-Disposition","inline;filename=\"" + filename+"\"");
 		}
 		response.setHeader("Cache-control","must-revalidate");
 		if ( filename != null ) {