diff --git a/swh/web/ui/templates/revision-log.html b/swh/web/ui/templates/revision-log.html
index b79e464b9..5a7774f77 100644
--- a/swh/web/ui/templates/revision-log.html
+++ b/swh/web/ui/templates/revision-log.html
@@ -1,111 +1,113 @@
 {% 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>
            <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>
            <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>
-    {% endif %}
-
-    {% if revision['message_url'] is not none %}
+    {% 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"><a href="{{ revision['message'] }}">Download raw message</a></div>
+              <div class="col-md-6">No message found.</div>
             </div>
-    {% endif %}
-	    
+    {% 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 %}
   </div>
   <hr />
   {% endfor %}
 
 {% endif %}
 
 {% endblock %}
diff --git a/swh/web/ui/templates/revision.html b/swh/web/ui/templates/revision.html
index aa80dd881..52e116e0f 100644
--- a/swh/web/ui/templates/revision.html
+++ b/swh/web/ui/templates/revision.html
@@ -1,91 +1,94 @@
 {% 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>
            <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>
            <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>
-    {% endif %}
-	    
-    {% if revision['message_url'] is not none %}
+    {% 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"><a href="{{ revision['message'] }}">Download raw message</a></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 %}
 
 </div>
 {% endif %}
 
 {% endblock %}