diff --git a/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html b/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html
index 26028c6eaa..afe60a92ff 100644
--- a/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html
+++ b/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html
@@ -16,31 +16,17 @@
                         {% if log.display %}
                             <br/><span class="fa fa-comment-o"></span> {{ log.display }}
                         {% endif %}
-                    </p>
-                    <p>
-                        <strong>Email address:</strong> {{ log.parsed_data.recipients }}
-                    </p>
-                    <p>
-                        <strong>Subject:</strong>
-                    </p>
-                    <p>
-                        {% for key,value in log.parsed_data.subject.items %}
-                            <p>
-                                {{ key }}: {{ value }}
-                            </p>
+                        <br/><span class="fa fa-shopping-cart"></span> {% trans "Sent to orders:" %}
+                        {% for status in log.parsed_data.sendto %}
+                            {{ status }}{% if forloop.revcounter > 1 %},{% endif %}
                         {% endfor %}
                     </p>
                     <p>
-                        <strong>Email content:</strong>
-                    </p>
-                    <p>
-                        {% for key,value in log.parsed_data.message.items %}
+                        {% for locale, value in log.pdata.locales.items %}
                             <p>
-                                {{ key }}:
-                            </p>
-                            <p>
-                                {{ value|linebreaksbr }}
+                                <strong>[{{ locale }}] {% trans "Subject:" %} {{ value.subject }}</strong>
                             </p>
+                            <pre>{{ value.message|linebreaksbr }}</pre>
                         {% endfor %}
                     </p>
                 </li>
diff --git a/src/pretix/plugins/sendmail/views.py b/src/pretix/plugins/sendmail/views.py
index 37a3d505a1..767290c45a 100644
--- a/src/pretix/plugins/sendmail/views.py
+++ b/src/pretix/plugins/sendmail/views.py
@@ -79,8 +79,8 @@ class SenderView(EventPermissionRequiredMixin, FormView):
                             user=self.request.user,
                             data={
                                 'subject': form.cleaned_data['subject'],
-                                'content': form.cleaned_data['message'],
-                                'recipients': o.email
+                                'message': form.cleaned_data['message'],
+                                'recipient': o.email
                             }
                         )
                 except SendMailException:
@@ -110,7 +110,7 @@ class EmailHistoryView(EventPermissionRequiredMixin, ListView):
     permission = 'can_change_orders'
     model = LogEntry
     context_object_name = 'logs'
-    paginate_by = 15
+    paginate_by = 5
 
     def get_queryset(self):
         qs = LogEntry.objects.filter(
@@ -118,3 +118,21 @@ class EmailHistoryView(EventPermissionRequiredMixin, ListView):
             action_type='pretix.plugins.sendmail.sent'
         )
         return qs
+
+    def get_context_data(self, **kwargs):
+        ctx = super().get_context_data()
+
+        status = dict(Order.STATUS_CHOICE)
+        for log in ctx['logs']:
+            log.pdata = log.parsed_data
+            log.pdata['locales'] = {}
+            for locale, msg in log.pdata['message'].items():
+                log.pdata['locales'][locale] = {
+                    'message': msg,
+                    'subject': log.pdata['subject'][locale]
+                }
+            log.pdata['sendto'] = [
+                status[s] for s in log.pdata['sendto']
+            ]
+
+        return ctx