diff --git a/cmd/web.go b/cmd/web.go
index 3bb5ef3a9c..a962f9ca5a 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -336,11 +336,7 @@ func runWeb(ctx *cli.Context) error {
 			}
 			defer fr.Close()
 
-			ctx.Header().Set("Cache-Control", "public,max-age=86400")
-			ctx.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, attach.Name))
-			// Fix #312. Attachments with , in their name are not handled correctly by Google Chrome.
-			// We must put the name in " manually.
-			if err = repo.ServeData(ctx, "\""+attach.Name+"\"", fr); err != nil {
+			if err = repo.ServeData(ctx, attach.Name, fr); err != nil {
 				ctx.Handle(500, "ServeData", err)
 				return
 			}
diff --git a/routers/repo/download.go b/routers/repo/download.go
index 3adab315d4..85e9fc64c9 100644
--- a/routers/repo/download.go
+++ b/routers/repo/download.go
@@ -5,8 +5,9 @@
 package repo
 
 import (
+	"fmt"
 	"io"
-	"path"
+	"strings"
 
 	"code.gitea.io/git"
 
@@ -22,14 +23,19 @@ func ServeData(ctx *context.Context, name string, reader io.Reader) error {
 		buf = buf[:n]
 	}
 
-	if !base.IsTextFile(buf) {
-		if !base.IsImageFile(buf) {
-			ctx.Resp.Header().Set("Content-Disposition", "attachment; filename=\""+path.Base(ctx.Repo.TreePath)+"\"")
-			ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
-		}
-	} else if !ctx.QueryBool("render") {
+	ctx.Resp.Header().Set("Cache-Control", "public,max-age=86400")
+
+	// Google Chrome dislike commas in filenames, so let's change it to a space
+	name = strings.Replace(name, ",", " ", -1)
+
+	if base.IsTextFile(buf) || ctx.QueryBool("render") {
 		ctx.Resp.Header().Set("Content-Type", "text/plain; charset=utf-8")
+	} else if base.IsImageFile(buf) || base.IsPDFFile(buf) {
+		ctx.Resp.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, name))
+	} else {
+		ctx.Resp.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, name))
 	}
+
 	ctx.Resp.Write(buf)
 	_, err := io.Copy(ctx.Resp, reader)
 	return err