2 files changed, 10 insertions, 0 deletions

diff --git a/hyperkitty/templates/message.html b/hyperkitty/templates/message.html
index 5d061e5..75770f1 100644
--- a/hyperkitty/templates/message.html
+++ b/hyperkitty/templates/message.html
@@ -9,6 +9,15 @@
 
 <section id="thread_content">
 	{% include 'messages/first_email.html' with first_mail=message %}
+
+    {% if attachments|length %}
+    <h2>Attachments</h2>
+    <ul>
+    {% for attachment in attachments %}
+        <li>{{attachment.name}} ({{attachment.content_type}}, {{attachment.size}} octets)</li>
+    {% endfor %}
+    </ul>
+    {% endif %}
 </section>
 
 {% endblock %}
diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index 1e8a53d..54613e0 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -21,6 +21,7 @@
 {% endif %}
 
 	{{email.content}}
+
 </div>
 
 {% if settings.USE_MOCKUPS %}