diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java
index 9c48c603..f901f792 100755
--- a/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java
+++ b/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java
@@ -90,6 +90,8 @@ public class FileAction extends Action {
         }
 
         response.setContent(file);
+        response.setHeader("Content-Disposition", "attachment; filename=\"" + file.getName() + "\"");
+
         return true;
     }
 
diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java
index 031bb4a1..84363f6b 100755
--- a/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java
+++ b/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java
@@ -187,6 +187,10 @@ public class UploadFileAction extends Action {
                     return false;
                 }
 
+                if(remoteFileName != null && remoteFileName.length() > 2 && remoteFileName.startsWith("'") && remoteFileName.endsWith("'")) {
+                    remoteFileName = remoteFileName.substring(1, remoteFileName.length()-1);
+                }
+
                 if (StringUtil.isNullOrEmpty(remoteFileName)) {
                     logger.warn("remoteFileName is empty!");