diff --git a/modoboa/extensions/amavis/sql_listing.py b/modoboa/extensions/amavis/sql_listing.py
index c8cbaf122..97936b33b 100644
--- a/modoboa/extensions/amavis/sql_listing.py
+++ b/modoboa/extensions/amavis/sql_listing.py
@@ -51,7 +51,12 @@ class Qtable(tables.Table):
     ]
 
     def parse_type(self, value):
-        color = 'important' if value in ['S', 'V'] else 'warning'
+        if value in ['S', 'V']:
+            color = 'important'
+        elif value == 'C':
+            color = 'success'
+        else:
+            color = 'warning'
         return '<span class="label label-%s">%s</span>' % (color, value)
 
     def parse_date(self, value):
diff --git a/modoboa/extensions/amavis/templates/amavis/main_action_bar.html b/modoboa/extensions/amavis/templates/amavis/main_action_bar.html
index 36b607005..a56ccccd3 100644
--- a/modoboa/extensions/amavis/templates/amavis/main_action_bar.html
+++ b/modoboa/extensions/amavis/templates/amavis/main_action_bar.html
@@ -6,6 +6,7 @@
       <span class="caret"></span>
     </button>
     <ul class="dropdown-menu">
+      {% if manual_learning %}<li><a name="selectmsgs" href="C">{% trans "Clean" %}</a></li>{% endif %}
       <li><a name="selectmsgs" href="S">{% trans "Spam" %}</a></li>
       <li><a name="selectmsgs" href="V">{% trans "Virus" %}</a></li>
       <li><a name="selectmsgs" href="H">{% trans "Bad Header" %}</a></li>
@@ -40,6 +41,9 @@
   <span class="label label-title">{% trans "Display" %}</span>
   <div id="filters" class="btn-group" data-toggle="buttons-radio">
     <button name="msgtype_all" class="btn" title="{% trans 'All messages' %}">{% trans "All" %}</button>
+    {% if manual_learning %}
+    <button name="msgtype_C" class="btn btn-success" title="{% trans 'Clean only' %}">C</button>
+    {% endif %}
     <button name="msgtype_S" class="btn btn-danger" title="{% trans 'Spam only' %}">S</button>
     <button name="msgtype_V" class="btn btn-danger" title="{% trans 'Virus only' %}">V</button>
     <button name="msgtype_H" class="btn btn-warning" title="{% trans 'Bad Header only' %}">H</button>