diff --git a/static/css/style.css b/static/css/style.css
index 430ab2a..267549a 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -900,7 +900,7 @@ table.metadata td.name {
 }
 
 .post .attachments {
-    margin: 10px 0 10px 64px;
+    padding-top: 4px;
 }
 
 .post .attachments a.image {
diff --git a/templates/activities/_post.html b/templates/activities/_post.html
index 4e5cb7c..099a35f 100644
--- a/templates/activities/_post.html
+++ b/templates/activities/_post.html
@@ -70,6 +70,18 @@
 
     <div class="content {% if post.summary %}hidden{% endif %}">
         {{ post.safe_content_local }}
+
+        {% if post.attachments.exists %}
+          <div class="attachments">
+            {% for attachment in post.attachments.all %}
+              {% if attachment.is_image %}
+                <a href="{{ attachment.full_url }}" class="image">
+                  <img src="{{ attachment.thumbnail_url }}" title="{{ attachment.name }}" alt="{{ attachment.name }}" />
+                </a>
+              {% endif %}
+            {% endfor %}
+          </div>
+        {% endif %}
     </div>
 
     {% if post.edited %}
@@ -78,15 +90,5 @@
     </div>
     {% endif %}
 
-    {% if post.attachments.exists %}
-        <div class="attachments">
-            {% for attachment in post.attachments.all %}
-                {% if attachment.is_image %}
-                    <a href="{{ attachment.full_url }}" class="image"><img src="{{ attachment.thumbnail_url }}" title="{{ attachment.name }}"></a>
-                {% endif %}
-            {% endfor %}
-        </div>
-    {% endif %}
-
     <a class="whole-box" href="{{ post.urls.view }}" tabindex="-1"></a>
 </div>