1 files changed, 23 insertions, 12 deletions

diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index 08d5cca..c971e16 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -2,17 +2,21 @@
 {% load gravatar %}
 
 <div class="email_header">
+	<div class="email_date inline-block pull-right">
+		<span class="date">{{email.date}}</span>
+		<br />
+	</div>
 	{% gravatar_img_for_email email.email 40 %}
 	<div class="email_author inline-block">
 		<span class="name"> <a href="{% url message_index mlist_fqdn=list_address, hashid=email.message_id_hash %}">{{email.sender_name}}</a> </span>
-        {% if settings.USE_MOCKUPS %}
 		<br />
-		<span class="rank">Rank 8</span>
+		<span class="rank">
+        {% if settings.USE_MOCKUPS %}
+            Rank 8
+        {% else %}
+            &nbsp;
         {% endif %}
-	</div>
-	<div class="email_date inline-block right">
-		<span class="date">{{email.date}}</span>
-		<br />
+		</span>
 	</div>
 </div>
 
@@ -24,6 +28,17 @@
 {{email.content}}
 </div>
 
+{% if unfolded and email.attachments|count %}
+<p class="attachments">Attachments:</p>
+<ul class="attachments-list">
+{% for attachment in email.attachments %}
+    <li><a href="{% url message_attachment mlist_fqdn=list_address, hashid=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a>
+        ({{attachment.content_type}} &mdash; {{attachment.size|filesizeformat}})
+    </li>
+{% endfor %}
+</ul>
+{% endif %}
+
 <ul class="email_info inline" messageid="{{email.message_id_hash}}">
 {% if settings.USE_MOCKUPS %}
 	<li class="neutral">
@@ -36,11 +51,9 @@
 		<a href="#dislike"> Dislike</a>
 	</li>
 {% endif %}
-{% if email.attachments|count %}
-    {% if not unfolded %}
+{% if not unfolded and email.attachments|count %}
     <li class="attachments">
-        <a href="#attachments">{{ email.attachments|count }} attachments</a>
-    {% endif %}
+        <a href="#attachments">{{ email.attachments|count }} attachment(s)</a>
         <ul class="attachments-list">
         {% for attachment in email.attachments %}
             <li><a href="{% url message_attachment mlist_fqdn=list_address, hashid=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a>
@@ -48,9 +61,7 @@
             </li>
         {% endfor %}
         </ul>
-    {% if not unfolded %}
     </li>
-    {% endif %}
 {% endif %}
 </ul>