diff --git a/modoboa/admin/templatetags/admin_extras.py b/modoboa/admin/templatetags/admin_extras.py
index a5ac79aec..8f9d7608b 100644
--- a/modoboa/admin/templatetags/admin_extras.py
+++ b/modoboa/admin/templatetags/admin_extras.py
@@ -209,9 +209,11 @@ def param(app, definition):
 
     result = """<div class='control-group'%s>
   <label class="param-label" for="%s">%s</label>
-  <div class="param-controls">""" \
-        % (extratags, name, definition.has_key("label") and _(definition["label"])
-           or definition["name"])
+""" % (extratags, name,
+       definition.has_key("label") and _(definition["label"])
+       or definition["name"])
+
+    result += "<div class='param-controls'>"
     if definition["type"] in ["string", "int"]:
         result += """
   <input type='text' name='%s' id='%s' value='%s' />""" % (name, name, value)
@@ -246,8 +248,9 @@ def param(app, definition):
 
     if definition.has_key("help"):
         result += """
-<p class="help-block">%s</p>
+<span class="help-block">%s</span>
 """ % _(definition["help"])
+
     result += """
   </div>
 </div>
diff --git a/modoboa/extensions/stats/templates/stats/index.html b/modoboa/extensions/stats/templates/stats/index.html
index 3b5f5381f..b99f30101 100644
--- a/modoboa/extensions/stats/templates/stats/index.html
+++ b/modoboa/extensions/stats/templates/stats/index.html
@@ -27,10 +27,12 @@ $(document).ready(function() {
     <li class="nav-header">
       {% trans "Filter" %}
     </li>
-    <div class="input-prepend input-append">
-      <span class="add-on"><i class="icon-search"></i></span>
-      <input class="span10" id="searchquery" type="text" value="{% trans 'Search a domain' %}">
-    </div>
+    <li>
+      <div class="input-prepend input-append">
+        <span class="add-on"><i class="icon-search"></i></span>
+        <input class="span10" id="searchquery" type="text" value="{% trans 'Search a domain' %}">
+      </div>
+    </li>
     <li class="nav-header">
       {% trans "Predefined time ranges" %}
     </li>
diff --git a/modoboa/extensions/webmail/__init__.py b/modoboa/extensions/webmail/__init__.py
index 342fc2828..66141e318 100644
--- a/modoboa/extensions/webmail/__init__.py
+++ b/modoboa/extensions/webmail/__init__.py
@@ -68,6 +68,7 @@ class Webmail(ModoExtension):
                                  help=ugettext_lazy("The default mode used when displaying a message"))
         parameters.register_user("ENABLE_LINKS", type="list_yesno", deflt="no",
                                  label=ugettext_lazy("Enable HTML links display"),
+                                 visible_if="DISPLAYMODE=html",
                                  help=ugettext_lazy("Enable/Disable HTML links display"))
 
     def destroy(self):
diff --git a/modoboa/static/css/custom.css b/modoboa/static/css/custom.css
index a40d8ac27..f69fd5c25 100644
--- a/modoboa/static/css/custom.css
+++ b/modoboa/static/css/custom.css
@@ -86,4 +86,9 @@ body {
 
 .hidden { 
     display: none;
+}
+
+.help-block { 
+    color: #999999;
+    font-style: italic;
 }
\ No newline at end of file