diff --git a/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html b/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html
index 1e4610149..f5680dcdc 100644
--- a/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html
+++ b/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html
@@ -4,8 +4,8 @@
 <div class="input-group">
   <label class="control-label col-lg-1 col-md-2 col-sm-3">{% trans "Thresholds" %}</label>
   <div class="col-lg-11 col-md-10 col-sm-9">
-    {{ form.spam_tag2_level }} <span class="help-inline pull-right">{% trans "or more is spam" %}</span><br>
-    {{ form.spam_kill_level }} <span class="help-inline pull-right">{% trans "or more throw spam message away" %}</span>
+    {{ form.spam_tag2_level }} <span class="help-block pull-right">{% trans "or more is spam" %}</span><br>
+    {{ form.spam_kill_level }} <span class="help-block pull-right">{% trans "or more throw spam message away" %}</span>
   </div>
 </div>
 {% render_field_with_activator form.spam_subject_tag2 _("default") %}
diff --git a/modoboa/static/js/global.js b/modoboa/static/js/global.js
index 7552d7519..f33e69628 100644
--- a/modoboa/static/js/global.js
+++ b/modoboa/static/js/global.js
@@ -112,7 +112,7 @@ if (!Object.keys) {
  */
 function clean_form_errors(formid) {
     $("#" + formid + " div.error").removeClass("error");
-    $("#" + formid + " span.help-inline").remove();
+    $("#" + formid + " span.help-block").remove();
 }
 
 /*
@@ -131,7 +131,7 @@ function display_form_errors(formid, data) {
         }
         if (!$span.length) {
             $span = $("<span />", {
-                "class": "help-inline",
+                "class": "help-block",
                 "html": value[0],
                 "id": spanid
             });