diff --git a/swh/web/ui/templates/content.html b/swh/web/ui/templates/content.html
index 2da5bd02f..8cb32bc32 100644
--- a/swh/web/ui/templates/content.html
+++ b/swh/web/ui/templates/content.html
@@ -1,28 +1,33 @@
 {% extends "layout.html" %}
 {% block title %}Content information{% endblock %}
 
 {% block content %}
   {% if message is not none %}
     <p>{{ message }}</p>
   {% endif %}
   {% if content is not none %}
     {% for key in ['sha1', 'sha256', 'sha1_git', 'status', 'length', 'ctime'] %}
     <div class="row">
        <div class="col-md-2">{{ key }}</div>
        <div class="col-md-6">{{ content[key] }}</div>
     </div>
     {% endfor %}
     {% if content['data_url'] is not none %}
     <div class="row">
        <div class="col-md-2">data_url</div>
        <div class="col-md-10"><a href="{{ content['data_url'] }}">Download data</a></pre></div>
     </div>
     {% endif %}
     {% if content['data'] is not none %}
     <div class="row">
        <div class="col-md-2">data</div>
        <div class="col-md-10"><pre>{{ content['data'] }}</pre></div>
     </div>
     {% endif %}
+    {% if 'decoding_failures' in content %}
+    <div class="row">
+      <div class="col-md-10">(some decoding errors)</div>
+    </div>
+    {% endif %}
   {% endif %}
 {% endblock %}
diff --git a/swh/web/ui/templates/directory.html b/swh/web/ui/templates/directory.html
index dd609d8fe..32244ad43 100644
--- a/swh/web/ui/templates/directory.html
+++ b/swh/web/ui/templates/directory.html
@@ -1,10 +1,15 @@
 {% extends "layout.html" %}
 {% block title %}Browse directory{% endblock %}
 {% block content %}
 {{ message }}
 {% if ls is not none %}
   {% for e in files %}
-    <div><p><a class="link{{e.type}}" href="{{e.target_url}}">{{ e.name }}</a></p></div>
+<div>
+  <p>
+    <a class="link{{e.type}}" href="{{e.target_url}}">{{ e.name }}</a>
+    {% if 'decoding_failures' in e %}(some decoding errors){% endif %}
+  </p>
+</div>
   {% endfor %}
 {% endif %}
 {% endblock %}
diff --git a/swh/web/ui/templates/entity.html b/swh/web/ui/templates/entity.html
index 8d5c19a95..9106cded4 100644
--- a/swh/web/ui/templates/entity.html
+++ b/swh/web/ui/templates/entity.html
@@ -1,23 +1,28 @@
 {% extends "layout.html" %}
 {% block title %}Entity information{% endblock %}
 {% block content %}
   {% if message is not none %}
     <p>{{ message | safe }}</p>
   {% endif %}
 
   {% if entities is not none %}
     {% for entity in entities %}
        <br />
        {% for key in ['uuid', 'parent', 'name', 'doap', 'lister_metadata',
                       'homepage', 'lister', 'description', 'type', 'last_id',
                       'generated', 'active', 'last_seen'] %}
          {% if entity[key] is not none %}
          <div class="row">
             <div class="col-md-2">{{ key }}</div>
             <div class="col-md-6">{{ entity[key] }}</div>
          </div>
          {% endif %}
        {% endfor %}
+         {% if 'decoding_failures' in entity %}
+	 <div class="row">
+	   <div class="col-md-10">(some decoding errors)</div>
+	 </div>
+	 {% endif %}
     {% endfor %}
   {% endif %}
 {% endblock %}
diff --git a/swh/web/ui/templates/origin.html b/swh/web/ui/templates/origin.html
index 10203314f..d2ccd5d83 100644
--- a/swh/web/ui/templates/origin.html
+++ b/swh/web/ui/templates/origin.html
@@ -1,22 +1,27 @@
 {% extends "layout.html" %}
 {% block title %}Origin{% endblock %}
 {% block content %}
 
 {% if message is not none %}
   {{ message }}
 {% endif %}
 
 {% if origin is not none %}
 <div> Details on origin {{ origin_id }}:
     {% for key in ['type', 'lister', 'projet', 'url'] %}
         {% if origin[key] is not none %}
             <div class="row">
               <div class="col-md-2">{{ key }}</div>
               <div class="col-md-6">{{ origin[key] }}</div>
             </div>
         {% endif %}
     {% endfor %}
+	{% if 'decoding_failures' in content %}
+	    <div class="row">
+	      <div class="col-md-10">(some decoding errors)</div>
+	    </div>
+	{% endif %}    
 </div>
 {% endif %}
 
 {% endblock %}
diff --git a/swh/web/ui/templates/person.html b/swh/web/ui/templates/person.html
index 5c125cfdf..ebf455f8b 100644
--- a/swh/web/ui/templates/person.html
+++ b/swh/web/ui/templates/person.html
@@ -1,22 +1,27 @@
 {% extends "layout.html" %}
 {% block title %}Person{% endblock %}
 {% block content %}
 
 {% if message is not none %}
   {{ message }}
 {% endif %}
 
 {% if person is not none %}
 <div> Details on person {{ person_id }}:
     {% for key in ['name', 'email'] %}
         {% if person[key] is not none %}
             <div class="row">
               <div class="col-md-2">{{ key }}</div>
               <div class="col-md-6">{{ person[key] }}</div>
             </div>
         {% endif %}
     {% endfor %}
+    {% if 'decoding_failures' in person %}
+    <div class="row">
+      <div class="col-md-10">(some decoding errors)</div>
+    </div>
+    {% endif %}
 </div>
 {% endif %}
 
 {% endblock %}
diff --git a/swh/web/ui/templates/release.html b/swh/web/ui/templates/release.html
index d7b326b5e..5e5335c7e 100644
--- a/swh/web/ui/templates/release.html
+++ b/swh/web/ui/templates/release.html
@@ -1,35 +1,43 @@
 {% extends "layout.html" %}
 {% block title %}Release{% endblock %}
 {% block content %}
 
 {% if message is not none %}
 {{ message }}
 {% endif %}
 
 {% if release is not none %}
 <div>
   {% for key in release.keys() %}
-    {% if key not in ['author', 'target_url', 'message', 'target', 'target_type'] and release[key] is not none %}
+    {% if key not in ['author', 'target_url', 'message', 'target', 'target_type', 'decoding_failures'] and release[key] is not none %}
     <div class="row">
       <div class="col-md-2">{{ key }}</div>
       <div class="col-md-6">{{ release[key] }}</div>
     </div>
     {% endif %}
   {% endfor %}
   {% if release['author'] is not none %}
   <div class="row">
     <div class="col-md-2">author</div>
-    <div class="col-md-6">{{ release['author']['name'] }} - {{ release['author']['email'] }}</div>
+    <div class="col-md-6">
+      {{ release['author']['name'] }} - {{ release['author']['email'] }}
+      {% if 'decoding_failures' in release['author'] %}(some decoding errors){% endif %}
+    </div>
   </div>
   {% endif %}
   </div>
   {% if release['target_url'] is not none %}
   <div class="row">
     <div class="col-md-2">{{ release['target_type'] }}</div>
     <div class="col-md-6"><a href="{{ release['target_url'] }}">{{ release['target_url'] }}</a></div>
   </div>
   {% endif %}
+  {% if 'decoding_failures' in release %}
+  <div class="row">
+    <div class="col-md-10">(some decoding errors)</div>
+  </div>
+  {% endif %}
 </div>
 {% endif %}
 
 {% endblock %}
diff --git a/swh/web/ui/templates/revision-directory.html b/swh/web/ui/templates/revision-directory.html
index 20ec0ed3d..674afa404 100644
--- a/swh/web/ui/templates/revision-directory.html
+++ b/swh/web/ui/templates/revision-directory.html
@@ -1,45 +1,60 @@
 {% extends "layout.html" %}
 {% block title %}Browse revision at path{% endblock %}
 {% block content %}
 
 {% if message is not none %}
 {{ message }}
 {% endif %}
 
 {% if result is not none %}
     <p>Browse revision '{{ revision }}' with {{ result['type'] }}path '{{ path }}':</p>
 
     {% if result['type'] == 'dir' %}
         {% if result['content'] is not none %}
             {% for e in result['content'] %}
               {% if e.type == 'dir' %}
-              <div><p><a class="link{{e.type}}" href="{{e.dir_url}}">{{ e.name }}</a></p></div>
+		<div>
+		  <p>
+		    <a class="link{{e.type}}" href="{{e.dir_url}}">{{ e.name }}</a>
+		    {% if 'decoding_failures' in e %}(some decoding errors){% endif %}
+		  </p>
+		</div>
               {% else %}
-              <div><p><a class="link{{e.type}}" href="{{e.file_url}}">{{ e.name }}</a></p></div>
-              {% endif %}
+		<div>
+		  <p>
+		    <a class="link{{e.type}}" href="{{e.file_url}}">{{ e.name }}</a>
+    		    {% if 'decoding_failures' in e %}(some decoding errors){% endif %}
+		  </p>
+		</div>
+            {% endif %}
             {% endfor %}
         {% endif %}
     {% else %}
         {% if result['content'] is not none %}
             {% for key in ['sha1', 'sha256', 'sha1_git', 'status', 'length', 'ctime'] %}
               <div class="row">
                  <div class="col-md-2">{{ key }}</div>
                  <div class="col-md-6">{{ result['content'][key] }}</div>
               </div>
             {% endfor %}
         {% endif %}
         {% if result['content']['data_url'] is not none %}
         <div class="row">
            <div class="col-md-2">data_url</div>
            <div class="col-md-10"><a href="{{ result['content']['data_url'] }}">Download data</a></pre></div>
         </div>
         {% endif %}
         {% if result['content']['data'] is not none %}
         <div class="row">
            <div class="col-md-2">data</div>
            <div class="col-md-10"><pre>{{ result['content']['data'] }}</pre></div>
         </div>
-        {% endif %}
+      {% endif %}
+      {% if 'decoding_failures' in result %}
+	<div class="row">
+	  <div class="col-md-10">(some decoding errors)</div>
+	</div>
+      {% endif %}
     {% endif %}
 {% endif %}
 {% endblock %}
diff --git a/swh/web/ui/templates/revision-log.html b/swh/web/ui/templates/revision-log.html
index 5a7774f77..ba124f082 100644
--- a/swh/web/ui/templates/revision-log.html
+++ b/swh/web/ui/templates/revision-log.html
@@ -1,113 +1,128 @@
 {% extends "layout.html" %}
 {% block title %}Revision Log{% endblock %}
 {% block content %}
 
 {% if message is not none %}
   {{ message }}
 {% endif %}
 
   <div class="container">
     <h2>Queried revision:</h2>
     {% if sha1_git is not none %}
     <div>Revision with git SHA1 <a href="{{ sha1_url }}">{{ sha1_git }}</a></div>
     {% else %}
     <div><a href="{{ origin_url }}">Origin ID {{ origin_id }}</a></div>
     <div>Branch name {{ branch_name }}</div>
     {% if timestamp is not none %}
     <div>Time stamp {{ timestamp }}</div>
     {% endif %}
     <div>
     </div>
     {% endif %}
   </div>
 
 {% if revisions is not none %}
   {% for revision in revisions %}
 
   <div class="container">
     {% if revision['url'] is not none %}
     <div class="row">
        <div class="col-md-2">Revision</div>
        <div class="col-md-6"><p><a href="{{ revision['url'] }}">{{ revision['url'] }}</a></p></div>
     </div>
     {% endif %}
 
     {% if revision['history_url'] is not none %}
     <div class="row">
        <div class="col-md-2">Revision Log</div>
        <div class="col-md-6"><p><a href="{{ revision['history_url'] }}">{{ revision['history_url'] }}</a></p></div>
     </div>
     {% endif %}
 
     {% if revision['directory_url'] is not none %}
            <div class="row">
               <div class="col-md-2">directory</div>
               <div class="col-md-6"><p><a href="{{ revision['directory_url'] }}">{{ revision['directory_url'] }}</a></p></div>
            </div>
      {% endif %}
 
     {% if revision['author'] is not none %}
            <div class="row">
               <div class="col-md-2">Author</div>
-              <div class="col-md-6"><p><a href="{{ revision['author_url'] }}">{{ revision['author']['name'] }}</a></p></div>
+              <div class="col-md-6">
+		<p>
+		  <a href="{{ revision['author_url'] }}">{{ revision['author']['name'] }}</a>
+		  {% if 'decoding_failures' in revision['author'] %}(some decoding errors){% endif %}
+		</p>
+	      </div>
            </div>
            <div class="row">
               <div class="col-md-2">Date</div>
               <div class="col-md-6"><p>{{ revision['date'] }}</p></div>
            </div>
     {% endif %}
 
     {% if revision['committer'] is not none %}
            <div class="row">
               <div class="col-md-2">Committer</div>
-              <div class="col-md-6"><p><a href="{{ revision['committer_url'] }}">{{ revision['committer']['name'] }}</a></p></div>
+              <div class="col-md-6">
+		<p>
+		  <a href="{{ revision['committer_url'] }}">{{ revision['committer']['name'] }}</a>
+		  {% if 'decoding_failures' in revision['committer'] %}(some decoding errors){% endif %}
+		</p>
+	      </div>
            </div>
            <div class="row">
               <div class="col-md-2">Committer Date</div>
               <div class="col-md-6"><p>{{ revision['committer_date'] }}</p></div>
            </div>
     {% endif %}
 
     {% if revision['message'] is not none %}
             <div class="row">
               <div class="col-md-2">Message</div>
               <div class="col-md-6"><pre>{{ revision['message'] }}</pre></div>
             </div>
     {% elif revision['message_encoding_failed'] %}
 	    <div class="row">
               <div class="col-md-2">Message</div>
               <div class="col-md-6"><a href="{{ revision['message_url'] }}">Download raw message</a></div>
             </div
     {% else %}
             <div class="row">
               <div class="col-md-2">Message</div>
               <div class="col-md-6">No message found.</div>
             </div>
     {% endif %}	    
 	    
     {% for key in revision.keys() %}
-           {% if key in ['type', 'synthetic'] and revision[key] is not none %}
+           {% if key in ['type', 'synthetic'] and key not in ['decoding_failures'] and revision[key] is not none %}
             <div class="row">
               <div class="col-md-2">{{ key }}</div>
               <div class="col-md-6"><p>{{ revision[key] }}</pre></div>
             </div>
            {% endif %}
     {% endfor %}
-
     {% for key in ['parent_urls', 'children_urls'] %}
         {% if revision[key] is not none %}
          <div class="row">
             <div class="col-md-2">{{ key }}</div>
             {% for link in revision[key] %}
             <div class="col-md-6"><a href="{{ link }}">{{ link }}</a></div>
             {% endfor %}
          </div>
         {% endif %}
     {% endfor %}
+	 {% if 'decoding_failures' in revision %}
+	 <div class="row">
+	   <div class="col-md-10">(some decoding errors occurred)</div>
+	 </div>
+	 {% endif %}
+
   </div>
   <hr />
   {% endfor %}
 
 {% endif %}
 
 {% endblock %}
diff --git a/swh/web/ui/templates/revision.html b/swh/web/ui/templates/revision.html
index 52e116e0f..307420bb7 100644
--- a/swh/web/ui/templates/revision.html
+++ b/swh/web/ui/templates/revision.html
@@ -1,94 +1,109 @@
 {% extends "layout.html" %}
 {% block title %}Revision{% endblock %}
 {% block content %}
 
 {% if message is not none %}
   {{ message }}
 {% endif %}
 
 {% if revision is not none %}
 <div>
     {% if revision['url'] is not none %}
     <div class="row">
        <div class="col-md-2">Revision</div>
        <div class="col-md-6"><p><a href="{{ revision['url'] }}">{{ revision['url'] }}</a></p></div>
     </div>
     {% endif %}
 
     {% if revision['history_url'] is not none %}
     <div class="row">
        <div class="col-md-2">Revision Log</div>
        <div class="col-md-6"><p><a href="{{ revision['history_url'] }}">{{ revision['history_url'] }}</a></p></div>
     </div>
     {% endif %}
 
     {% if revision['directory_url'] is not none %}
            <div class="row">
               <div class="col-md-2">directory</div>
               <div class="col-md-6"><p><a href="{{ revision['directory_url'] }}">{{ revision['directory_url'] }}</a></p></div>
            </div>
      {% endif %}
 
     {% if revision['author'] is not none %}
            <div class="row">
               <div class="col-md-2">Author</div>
-              <div class="col-md-6"><p><a href="{{ revision['author_url'] }}">{{ revision['author']['name'] }}</a></p></div>
+              <div class="col-md-6">
+		<p>
+		  <a href="{{ revision['author_url'] }}">{{ revision['author']['name'] }}</a>
+		  {% if 'decoding_failures' in revision['author'] %}(some decoding failed){% endif %}
+		</p>
+	      </div>
            </div>
            <div class="row">
               <div class="col-md-2">Date</div>
               <div class="col-md-6"><p>{{ revision['date'] }}</p></div>
            </div>
     {% endif %}
 
     {% if revision['committer'] is not none %}
            <div class="row">
               <div class="col-md-2">Committer</div>
-              <div class="col-md-6"><p><a href="{{ revision['committer_url'] }}">{{ revision['committer']['name'] }}</a></p></div>
+              <div class="col-md-6">
+		<p>
+		  <a href="{{ revision['committer_url'] }}">{{ revision['committer']['name'] }}</a>
+		  {% if 'decoding_failures' in revision['committer'] %}(some decoding failed){% endif %}
+		</p>
+	      </div>
            </div>
            <div class="row">
               <div class="col-md-2">Committer Date</div>
               <div class="col-md-6"><p>{{ revision['committer_date'] }}</p></div>
            </div>
     {% endif %}
 
     {% if revision['message'] is not none %}
             <div class="row">
               <div class="col-md-2">Message</div>
               <div class="col-md-6"><pre>{{ revision['message'] }}</pre></div>
             </div>
     {% elif revision['message_encoding_failed'] %}
 	    <div class="row">
               <div class="col-md-2">Message</div>
               <div class="col-md-6"><a href="{{ revision['message_url'] }}">Download raw message</a></div>
             </div
     {% else %}
             <div class="row">
               <div class="col-md-2">Message</div>
               <div class="col-md-6">No message found.</div>
             </div>
     {% endif %}
 
     {% for key in revision.keys() %}
            {% if key in ['type', 'synthetic'] and revision[key] is not none %}
             <div class="row">
               <div class="col-md-2">{{ key }}</div>
               <div class="col-md-6"><p>{{ revision[key] }}</pre></div>
             </div>
            {% endif %}
     {% endfor %}
 
     {% for key in ['parent_urls', 'children_urls'] %}
         {% if revision[key] is not none %}
          <div class="row">
             <div class="col-md-2">{{ key }}</div>
             {% for link in revision[key] %}
             <div class="col-md-6"><a href="{{ link }}">{{ link }}</a></div>
             {% endfor %}
          </div>
         {% endif %}
     {% endfor %}
+    {% if 'decoding_failures' in revision %}
+    <div class="row">
+      <div class="col-md-10">(some decoding failed)</div>
+    </div>
+    {% endif %}
 
 </div>
 {% endif %}
 
 {% endblock %}