diff --git a/modules/base/tool.go b/modules/base/tool.go
index 9dcbb881d..75f475fa4 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -53,7 +53,11 @@ func ShortSha(sha1 string) string {
 }
 
 func DetectEncoding(content []byte) string {
-	_, name, certain := charset.DetermineEncoding(content, setting.Repository.AnsiCharset)
+	_, name, certain := charset.DetermineEncoding(content, "")
+	if name != "utf-8" && len(setting.Repository.AnsiCharset) > 0 {
+		log.Debug("Using default AnsiCharset: %s", setting.Repository.AnsiCharset)
+		return setting.Repository.AnsiCharset
+	}
 	log.Debug("Detected encoding: %s (%v)", name, certain)
 	return name
 }
diff --git a/public/css/gogs.css b/public/css/gogs.css
index 7bd1d2254..1ed66997d 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -1902,7 +1902,7 @@ footer .container .links > *:first-child {
   margin-top: -2px;
 }
 .repository.file.list #file-content .view-raw * {
-  width: 100%;
+  max-width: 100%;
 }
 .repository.file.list #file-content .view-raw img {
   padding: 5px 5px 0 5px;
diff --git a/public/less/_repository.less b/public/less/_repository.less
index 14306ee8d..9891886e8 100644
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -181,7 +181,7 @@
 			}
 			.view-raw {
 				* {
-					width: 100%;
+					max-width: 100%;
 				}
 				img {
 					padding: 5px 5px 0 5px;
diff --git a/routers/repo/download.go b/routers/repo/download.go
index cb863c613..a10792b87 100644
--- a/routers/repo/download.go
+++ b/routers/repo/download.go
@@ -28,6 +28,8 @@ func ServeData(ctx *middleware.Context, name string, reader io.Reader) error {
 			ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(ctx.Repo.TreeName))
 			ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
 		}
+	} else {
+		ctx.Resp.Header().Set("Content-Type", "text/plain")
 	}
 	ctx.Resp.Write(buf)
 	_, err := io.Copy(ctx.Resp, reader)
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
index 44d74f9c9..44fc44913 100644
--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -28,7 +28,7 @@
 			{{if .ReadmeExist}}
 				{{if .FileContent}}{{.FileContent | Str2html}}{{end}}
 			{{else if not .IsFileText}}
-				<div class="view-raw">
+				<div class="view-raw ui center">
 					{{if .IsImageFile}}
 						<img src="{{EscapePound .FileLink}}">
 					{{else}}