diff --git a/src/pretix/control/templates/pretixcontrol/event/mail_settings_fragment.html b/src/pretix/control/templates/pretixcontrol/event/mail_settings_fragment.html
index 2b50755dc..d243bdbd4 100644
--- a/src/pretix/control/templates/pretixcontrol/event/mail_settings_fragment.html
+++ b/src/pretix/control/templates/pretixcontrol/event/mail_settings_fragment.html
@@ -23,6 +23,14 @@
                         {% with form|getattr:item as field %}
                         <label class="col-md-3 control-label">{{ field.label }}</label>
                         <div class="col-md-9">
+                            <ul class="nav nav-tabs">
+                                <li role="presentation" class="active">
+                                    <a data-toggle="tab" type="edit" href="#{{ item }}_edit"><i class="fa fa-pencil-square-o fa-fw"></i> {% trans "Edit" %}</a>
+                                </li>
+                                <li role="presentation">
+                                    <a data-toggle="tab" type="preview" href="#{{ item }}_preview"><i class="fa fa-tv fa-fw"></i> {% trans "Preview" %}</a>
+                                </li>
+                            </ul>
                             <div class="tab-content">
                                 <div id="{{ item }}_edit" class="tab-pane fade in active">
                                     {% bootstrap_field field show_label=False form_group_class="" %}
@@ -33,14 +41,6 @@
                                     {% endfor %}
                                 </div>
                             </div>
-                            <ul class="nav nav-pills pull-right">
-                                <li role="presentation" class="active">
-                                    <a data-toggle="pill" type="edit" href="#{{ item }}_edit"><i class="fa fa-pencil-square-o fa-fw"></i> {% trans "Edit" %}</a>
-                                </li>
-                                <li role="presentation">
-                                    <a data-toggle="pill" type="preview" href="#{{ item }}_preview"><i class="fa fa-tv fa-fw"></i> {% trans "Preview" %}</a>
-                                </li>
-                            </ul>
                         </div>
                         {% endwith %}
                     </div>
diff --git a/src/pretix/static/pretixcontrol/scss/_forms.scss b/src/pretix/static/pretixcontrol/scss/_forms.scss
index e49a75708..d090927ae 100644
--- a/src/pretix/static/pretixcontrol/scss/_forms.scss
+++ b/src/pretix/static/pretixcontrol/scss/_forms.scss
@@ -74,8 +74,18 @@ div[data-formset-body], div[data-formset-form], div[data-nested-formset-form], d
   margin-bottom: 0;
 }
 
-.container ul.nav-pills {
-  margin: 20px 0;
+.preview-panel .nav-tabs {
+  border-bottom: 0px solid #ddd;
+}
+
+.tab-content {
+    border: 1px solid #ddd;
+    border-radius: 0px 5px 5px 5px;
+    padding: 5px 5px 0px 5px;
+}
+
+.mail-preview-group {
+  margin-bottom: -15px;
 }
 
 .variation-matrix {