diff --git a/rhodecode/templates/admin/gists/gist_show.mako b/rhodecode/templates/admin/gists/gist_show.mako
--- a/rhodecode/templates/admin/gists/gist_show.mako
+++ b/rhodecode/templates/admin/gists/gist_show.mako
@@ -97,7 +97,7 @@
                 -->
                 <div class="code-body textarea text-area editor">
                     %if renderer:
-                        ${h.render(gist_file.content, renderer=renderer)}
+                        ${h.render(gist_file.str_content, renderer=renderer)}
                     %else:
                         ${h.pygmentize(gist_file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
                     %endif
diff --git a/rhodecode/templates/changeset/diff_block.mako b/rhodecode/templates/changeset/diff_block.mako
--- a/rhodecode/templates/changeset/diff_block.mako
+++ b/rhodecode/templates/changeset/diff_block.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 ##usage:
 ## <%namespace name="diff_block" file="/changeset/diff_block.mako"/>
 ## ${diff_block.diff_block_changeset_table(change)}
@@ -16,7 +15,7 @@
     <div id="${h.FID('',filenode_path)}_target" ></div>
     <div id="${h.FID('',filenode_path)}" class="diffblock margined comm">
       <div class="code-body">
-        <div class="full_f_path" path="${h.safe_unicode(filenode_path)}" style="display: none"></div>
+        <div class="full_f_path" path="${h.safe_str(filenode_path)}" style="display: none"></div>
         ${diff|n}
           % if file_data["is_limited_diff"]:
             % if file_data["exceeds_limit"]:
@@ -37,7 +36,7 @@
     <div id="${h.FID('',filenode_path)}_target" ></div>
     <div id="${h.FID('',filenode_path)}" class="diffblock margined comm" >
         <div class="code-body">
-            <div class="full_f_path" path="${h.safe_unicode(filenode_path)}" style="display: none;"></div>
+            <div class="full_f_path" path="${h.safe_str(filenode_path)}" style="display: none;"></div>
             ${diff|n}
            % if file_data["is_limited_diff"]:
               % if file_data["exceeds_limit"]:
diff --git a/rhodecode/templates/files/files_edit.mako b/rhodecode/templates/files/files_edit.mako
--- a/rhodecode/templates/files/files_edit.mako
+++ b/rhodecode/templates/files/files_edit.mako
@@ -71,7 +71,7 @@
 
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
-                    <textarea id="editor" name="content" >${h.escape(c.file.content)|n}</textarea>
+                    <textarea id="editor" name="content" >${h.escape(c.file.str_content)|n}</textarea>
                     <div id="editor_preview" ></div>
                 </div>
             </div>
diff --git a/rhodecode/templates/files/files_source.mako b/rhodecode/templates/files/files_source.mako
--- a/rhodecode/templates/files/files_source.mako
+++ b/rhodecode/templates/files/files_source.mako
@@ -146,7 +146,7 @@
                             'standard': h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path),
                         }
                     %>
-                    ${h.render(c.file.content, renderer=c.renderer, relative_urls=relative_urls)}
+                    ${h.render(c.file.str_content, renderer=c.renderer, relative_urls=relative_urls)}
                 %else:
                     <table class="cb codehilite">
                     %if c.annotate: