diff --git a/shop/email.py b/shop/email.py
index c679fc94..66e0d9e2 100644
--- a/shop/email.py
+++ b/shop/email.py
@@ -8,9 +8,9 @@ def send_email(emailtype, recipient, formatdict, subject, sender='BornHack <nore
     html_template=None
 
     if emailtype == 'invoice':
-        text_template = 'emails/invoice.txt'
-        html_template = 'emails/invoice.html'
-        attachment_filename = formatdict['attachmentname']
+        text_template = 'emails/invoice_email.txt'
+        html_template = 'emails/invoice_email.html'
+        attachment_filename = formatdict['filename']
     elif emailtype == 'testmail':
         text_template = 'emails/testmail.txt'
     else:
@@ -25,7 +25,7 @@ def send_email(emailtype, recipient, formatdict, subject, sender='BornHack <nore
         if html_template:
             msg.attach_alternative(render_to_string(html_template, formatdict), 'text/html')
 
-        ### is there an attachment to this mail?
+        ### is there a pdf attachment to this mail?
         if attachment:
             msg.attach(attachment_filename, attachment, 'application/pdf')
 
@@ -43,16 +43,17 @@ def send_email(emailtype, recipient, formatdict, subject, sender='BornHack <nore
 def send_invoice_email(invoice, attachment):
     # put formatdict together
     formatdict = {
-        'order': invoice.order,
-        'attachmentname': invoice.filename,
+        'ordernumber': invoice.order.pk,
+        'invoicenumber': invoice.pk,
+        'filename': invoice.filename,
     }
 
-    subject = 'BornHack invoice %s' % order.pk
+    subject = 'BornHack invoice %s' % invoice.pk
 
     # send mail
     return send_email(
         emailtype='invoice',
-        recipient=order.user.email,
+        recipient=invoice.order.user.email,
         formatdict=formatdict,
         subject=subject,
         sender='noreply@bornfiber.dk',
diff --git a/shop/management/commands/invoice-worker.py b/shop/management/commands/invoice-worker.py
index b3f80f20..ea5e1a9c 100644
--- a/shop/management/commands/invoice-worker.py
+++ b/shop/management/commands/invoice-worker.py
@@ -24,6 +24,7 @@ class Command(BaseCommand):
                 formatdict = {
                     'invoice': invoice,
                 }
+
                 # generate the pdf
                 try:
                     pdffile = generate_pdf_letter(
@@ -35,6 +36,7 @@ class Command(BaseCommand):
                 except Exception as E:
                     self.stdout.write('ERROR: Unable to generate PDF file for invoice #%s. Error: %s' % (invoice.pk, E))
                     continue
+
                 # so, do we have a pdf?
                 if not pdffile:
                     self.stdout.write('ERROR: Unable to generate PDF file for invoice #%s' % invoice.pk)
@@ -61,4 +63,3 @@ class Command(BaseCommand):
             ### pause for a bit
             sleep(60)
 
-
diff --git a/shop/templates/emails/invoice_email.html b/shop/templates/emails/invoice_email.html
new file mode 100644
index 00000000..ccd26e0e
--- /dev/null
+++ b/shop/templates/emails/invoice_email.html
@@ -0,0 +1,16 @@
+Hello!<br>
+<br>
+This email contains the invoice for your purchase from BornHack.<br>
+Your order number is <b>{{ ordernumber }}</b> and your invoice number is <b>{{ invoicenumber }}</b>.<br>
+<br>
+Your order has been paid in full. The invoice is attached in PDF format with the filename <b>{{ filename }}</b>.<br>
+<br>
+Tickets will be generated closer to the event. Ticket holders will receive an email when tickets can be downloaded from the webshop. Merchandise can be picked up from the info booth during the event.<br>
+<br>
+Thank your for your purchase!<br>
+<br>
+<br>
+Best regards,<br>
+<br>
+The BornHack Team<br>
+<br>
\ No newline at end of file
diff --git a/shop/templates/emails/invoice_email.txt b/shop/templates/emails/invoice_email.txt
new file mode 100644
index 00000000..e4f74ee5
--- /dev/null
+++ b/shop/templates/emails/invoice_email.txt
@@ -0,0 +1,19 @@
+Hello!
+
+This email contains the invoice for your purchase from BornHack.
+Your order number is {{ ordernumber }} and your invoice number is {{ invoicenumber }}.
+
+Your order has been paid in full. The invoice is attached in PDF 
+format with the filename {{ filename }}.
+
+Tickets will be generated closer to the event. Ticket 
+holders will receive an email when tickets can be downloaded
+from the webshop. Merchandise can be picked up from the info 
+booth during the event.
+
+Thank your for your purchase!
+
+
+Best regards,
+
+The BornHack Team
diff --git a/shop/templates/emails/testmail.txt b/shop/templates/emails/testmail.txt
new file mode 100644
index 00000000..e594893e
--- /dev/null
+++ b/shop/templates/emails/testmail.txt
@@ -0,0 +1 @@
+testmail from bornhack website
diff --git a/shop/templates/invoice.html b/shop/templates/invoice.html
new file mode 100644
index 00000000..64807bee
--- /dev/null
+++ b/shop/templates/invoice.html
@@ -0,0 +1,42 @@
+{% load shop_tags %}
+This is an invoice.
+
+<table class="table table-bordered table-hover">
+  <thead>
+    <tr>
+      <th>
+        Name
+      <th>
+        Quantity
+      <th>
+        Price
+      <th>
+        Total
+  <tbody>
+{% for order_product in invoice.order.orderproductrelation_set.all %}
+  <tr>
+    <td>
+      {{ order_product.product.name }}
+    <td>
+      {{ order_product.quantity }}
+    <td>
+      {{ order_product.product.price|currency }}
+    <td>
+      {{ order_product.total|currency }}
+{% endfor %}
+
+  <tr>
+    <td colspan="2">
+    <td>
+      <strong>Hereof VAT (25%)</strong>
+    <td>
+      {{ order.vat|currency }}
+
+  <tr>
+    <td colspan="2">
+    <td>
+      <strong>Total</strong>
+    <td>
+      {{ order.total|currency }}
+
+</table>