diff --git a/kernel-util/src/main/java/org/sakaiproject/util/Web.java b/kernel-util/src/main/java/org/sakaiproject/util/Web.java
index 9e0f43f..886c520 100644
--- a/kernel-util/src/main/java/org/sakaiproject/util/Web.java
+++ b/kernel-util/src/main/java/org/sakaiproject/util/Web.java
@@ -555,11 +555,11 @@ public class Web
 		try
 		{
 			if ( agent != null && agent.indexOf("MSIE")>=0 )
-				fileName = java.net.URLEncoder.encode(fileName, "UTF8");
+				fileName = java.net.URLEncoder.encode(fileName, "UTF8").replace("+", "%20");
 			else if ( agent != null && agent.indexOf("Mozilla")>=0 && agent.indexOf("Safari") == -1 )
 				fileName = javax.mail.internet.MimeUtility.encodeText(fileName, "UTF8", "B");
 			else
-				fileName = java.net.URLEncoder.encode(fileName, "UTF8");
+				fileName = java.net.URLEncoder.encode(fileName, "UTF8").replace("+", "%20");
 		}
 		catch (java.io.UnsupportedEncodingException e)
 		{