diff --git a/rhodecode/apps/repository/views/repo_files.py b/rhodecode/apps/repository/views/repo_files.py
--- a/rhodecode/apps/repository/views/repo_files.py
+++ b/rhodecode/apps/repository/views/repo_files.py
@@ -812,7 +812,7 @@ class RepoFilesView(RepoAppView):
                   "filename=\"{}\"; " \
                   "filename*=UTF-8\'\'{}".format(safe_path, encoded_path)
 
-        return headers.encode().decode('iso-8859-1', errors='replace')
+        return safe_bytes(headers).decode('latin-1', errors='replace')
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(