diff --git a/modoboa/extensions/amavis/templates/amavis/main_action_bar.html b/modoboa/extensions/amavis/templates/amavis/main_action_bar.html
index ce0f1d44f..e09b9a8c1 100644
--- a/modoboa/extensions/amavis/templates/amavis/main_action_bar.html
+++ b/modoboa/extensions/amavis/templates/amavis/main_action_bar.html
@@ -2,33 +2,31 @@
 <div class="row">
   <div class="col-lg-9 col-md-8 col-xs-12">
     <div class="navbar-nav">
-      <div>
-        <div class="btn-group" title="{% trans 'Select' %}">
-          <a class="btn btn-default"><input type="checkbox" id="selectall" /></a>
-          <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-            <span class="caret"></span>
-          </button>
-          <ul class="dropdown-menu">
-            <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>
-            <li><a name="selectmsgs" href="M">{% trans "Bad MIME" %}</a></li>
-            <li><a name="selectmsgs" href="B">{% trans "Banned" %}</a></li>
-          </ul>
-        </div>
-        <div class="btn-group">
-          <a name="release-multi" href="{% url 'amavis:mail_process' %}" class="btn btn-success disabled">
-            <span class="fa fa-check"></span> <span>{% trans "Release" %}</span>
-          </a>
-        </div>
-        <div class="btn-group">
-          <a name="delete-multi" href="{% url 'amavis:mail_process' %}" class="btn btn-danger disabled">
-            <span class="fa fa-trash"></span> <span>{% trans "Delete" %}</span>
-          </a>
-        </div>
-        <div class="btn-group">
-          {% include "common/email_searchbar.html" with extraopts=extraopts %}
-        </div>
+      <div class="btn-group" title="{% trans 'Select' %}">
+        <a class="btn btn-default"><input type="checkbox" id="selectall" /></a>
+        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+          <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu">
+          <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>
+          <li><a name="selectmsgs" href="M">{% trans "Bad MIME" %}</a></li>
+          <li><a name="selectmsgs" href="B">{% trans "Banned" %}</a></li>
+        </ul>
+      </div>
+      <div class="btn-group">
+        <a name="release-multi" href="{% url 'amavis:mail_process' %}" class="btn btn-success disabled">
+          <span class="fa fa-check"></span> <span>{% trans "Release" %}</span>
+        </a>
+      </div>
+      <div class="btn-group">
+        <a name="delete-multi" href="{% url 'amavis:mail_process' %}" class="btn btn-danger disabled">
+          <span class="fa fa-trash"></span> <span>{% trans "Delete" %}</span>
+        </a>
+      </div>
+      <div class="btn-group">
+        {% include "common/email_searchbar.html" with extraopts=extraopts %}
       </div>
     </div>
   </div>
diff --git a/modoboa/templates/common/email_searchbar.html b/modoboa/templates/common/email_searchbar.html
index a98d718d2..be936aa4b 100644
--- a/modoboa/templates/common/email_searchbar.html
+++ b/modoboa/templates/common/email_searchbar.html
@@ -1,39 +1,41 @@
 {% load i18n %}
-<div id="searchbox" class="">
-  <div class="input-group">
-    <input type="text" class="form-control" name="searchfield" id="searchfield" placeholder="{% trans "Search..." %}" />
-    <ul class="dropdown-menu pull-right" id="searchparams">
-      <li>
-        <div class="radio">
-          <label>
-            <input type="radio" id="crit_from_addr" name="scriteria" value="from_addr" checked> {% trans "From address" %}
-          </label>
-        </div>
-      </li>
-      <li>
-        <div class="radio">
-          <label>
-            <input type="radio" id="crit_subject" name="scriteria" value="subject"> {% trans "Subject" %}
-          </label>
-        </div>
-      </li>
-      {% for opt in extraopts %}
-      <li>
-        <div class="radio">
-          <label>
-            <input type="radio" id="crit_{{ opt.name }}" name="scriteria" value="{{ opt.name }}">{{ opt.label }}
-          </label>
-        </div>
-      </li>
-      {% endfor %}
-      <li>
-        <div class="radio">
-          <label>
-            <input type="radio" id="crit_both" name="scriteria" value="both">{% trans "Both" %}
-          </label>
-        </div>
-      </li>
-    </ul>
-    <a href="#" class="input-group-addon" data-toggle="dropdown"><span class="fa fa-search" id="searchopts"></span></a>
+<div id="searchbox" class="form-inline">
+  <div class="form-group">
+    <div class="input-group">
+      <input type="text" class="form-control" name="searchfield" id="searchfield" placeholder="{% trans "Search..." %}" />
+      <ul class="dropdown-menu pull-right" id="searchparams">
+        <li>
+          <div class="radio">
+            <label>
+              <input type="radio" id="crit_from_addr" name="scriteria" value="from_addr" checked> {% trans "From address" %}
+            </label>
+          </div>
+        </li>
+        <li>
+          <div class="radio">
+            <label>
+              <input type="radio" id="crit_subject" name="scriteria" value="subject"> {% trans "Subject" %}
+            </label>
+          </div>
+        </li>
+        {% for opt in extraopts %}
+        <li>
+          <div class="radio">
+            <label>
+              <input type="radio" id="crit_{{ opt.name }}" name="scriteria" value="{{ opt.name }}">{{ opt.label }}
+            </label>
+          </div>
+        </li>
+        {% endfor %}
+        <li>
+          <div class="radio">
+            <label>
+              <input type="radio" id="crit_both" name="scriteria" value="both">{% trans "Both" %}
+            </label>
+          </div>
+        </li>
+      </ul>
+      <a href="#" class="input-group-addon" data-toggle="dropdown"><span class="fa fa-search" id="searchopts"></span></a>
+    </div>
   </div>
 </div>