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 f4afd9eee2..2b50755dc1 100644
--- a/src/pretix/control/templates/pretixcontrol/event/mail_settings_fragment.html
+++ b/src/pretix/control/templates/pretixcontrol/event/mail_settings_fragment.html
@@ -27,9 +27,9 @@
                                 <div id="{{ item }}_edit" class="tab-pane fade in active">
                                     {% bootstrap_field field show_label=False form_group_class="" %}
                                 </div>
-                                <div id="{{ item }}_preview" class="tab-pane">
+                                <div id="{{ item }}_preview" class="tab-pane mail-preview-group">
                                     {% for l in request.event.settings.locales %}
-                                        <pre lang="{{ l }}" for="{{ item }}"></pre>
+                                        <pre lang="{{ l }}" for="{{ item }}" class="mail-preview"></pre>
                                     {% endfor %}
                                 </div>
                             </div>
@@ -50,4 +50,4 @@
             {% endwith %}
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/pretix/control/views/event.py b/src/pretix/control/views/event.py
index 71837192d1..d17c5a10cc 100644
--- a/src/pretix/control/views/event.py
+++ b/src/pretix/control/views/event.py
@@ -423,7 +423,7 @@ class MailSettingsPreview(EventPermissionRequiredMixin, View):
         return {
             'date': date_format(now() + timedelta(days=7), 'SHORT_DATE_FORMAT'),
             'expire_date': date_format(now() + timedelta(days=15), 'SHORT_DATE_FORMAT'),
-            'payment_info': _('{} {} has been transferred to account<9999-9999-9999-9999> at {}').format(
+            'payment_info': _('{} {} has been transferred to account <9999-9999-9999-9999> at {}').format(
                 42.23, self.request.event.currency, date_format(now(), 'SHORT_DATETIME_FORMAT'))
         }
 
diff --git a/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html b/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html
index bd66f08677..59690115bf 100644
--- a/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html
+++ b/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html
@@ -13,22 +13,15 @@
             {% if request.method == "POST" %}
             <fieldset>
             <legend>{% trans "E-mail preview" %}</legend>
-                {% for locale, segments in output.items %}
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <h4 class="panel-title">
-                                <strong>{% blocktrans %}For locale: {{ locale }}{% endblocktrans %}</strong>
-                            </h4>
-                        </div>
-                        <div class="panel-body">
+                <div class="tab-pane mail-preview-group">
+                    {% for locale, segments in output.items %}
+                        <pre lang="{{ locale }}" class="mail-preview">{% spaceless %}
                             {% for value in segments %}
-                                <p>
-                                    {{ value|linebreaksbr }}
-                                </p>
+                                {{ value|linebreaksbr }}
                             {% endfor %}
-                        </div>
-                    </div>
-                {% endfor %}
+                        {% endspaceless %}</pre>
+                    {% endfor %}
+                </div>
             </fieldset>
             {% endif %}
             <div class="form-group submit-group">
diff --git a/src/pretix/static/pretixcontrol/scss/_flags.scss b/src/pretix/static/pretixcontrol/scss/_flags.scss
index c49ff1be65..65e3b9f935 100644
--- a/src/pretix/static/pretixcontrol/scss/_flags.scss
+++ b/src/pretix/static/pretixcontrol/scss/_flags.scss
@@ -9,7 +9,7 @@ textarea[lang] {
 pre[lang] {
   background: no-repeat 10px 10px;
   padding-left: 34px;
-  padding-top: 5px;
+  padding-top: 8px;
   margin-bottom: 20px;
 }
 
@@ -255,5 +255,4 @@ pre[lang=yt], input[lang=yt], textarea[lang=yt] { background-image: url(static('
 pre[lang=za], input[lang=za], textarea[lang=za] { background-image: url(static('pretixbase/img/flags/za.png')); }
 pre[lang=zm], input[lang=zm], textarea[lang=zm] { background-image: url(static('pretixbase/img/flags/zm.png')); }
 pre[lang=zw], input[lang=zw], textarea[lang=zw] { background-image: url(static('pretixbase/img/flags/zw.png')); }
-
 pre[lang=en], input[lang=en], textarea[lang=en] { background-image: url(static('pretixbase/img/flags/gb.png')); }
diff --git a/src/pretix/static/pretixcontrol/scss/_forms.scss b/src/pretix/static/pretixcontrol/scss/_forms.scss
index 5198e6734d..87199030f3 100644
--- a/src/pretix/static/pretixcontrol/scss/_forms.scss
+++ b/src/pretix/static/pretixcontrol/scss/_forms.scss
@@ -117,3 +117,24 @@ div[data-formset-body], div[data-formset-form], div[data-nested-formset-form], d
 .ticketoutput-panel .panel-title {
   line-height: 30px;
 }
+
+pre.mail-preview {
+  white-space: pre-line;       /* Since CSS 2.1 */
+  word-wrap: break-word;       /* Internet Explorer 5.5+ */
+}
+
+.mail-preview-group pre[lang] {
+  @include border-top-radius(0px);
+  @include border-bottom-radius(0px);
+  border-top-width: 0;
+  margin-bottom: 0;
+
+  &:first-child {
+    @include border-top-radius($input-border-radius);
+    border-top-width: 1px;
+  }
+  &:last-child {
+    @include border-bottom-radius($input-border-radius);
+    margin-bottom: 20px;
+  }
+}