diff --git a/lib/attachment.php b/lib/attachment.php
index ac0a32aeb5..d001337dd6 100644
--- a/lib/attachment.php
+++ b/lib/attachment.php
@@ -35,7 +35,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class Attachment extends AttachmentListItem
 {
-    function showLink() {
+    function showNoticeAttachment() {
         if (Event::handle('StartShowAttachmentLink', array($this->out, $this->attachment))) {
             $this->out->elementStart('div', array('id' => 'attachment_view',
                                                   'class' => 'h-entry'));
diff --git a/lib/attachmentlistitem.php b/lib/attachmentlistitem.php
index 934c5f74dd..fe11dbe639 100644
--- a/lib/attachmentlistitem.php
+++ b/lib/attachmentlistitem.php
@@ -86,28 +86,26 @@ class AttachmentListItem extends Widget
     }
 
     function linkAttr() {
-        return array('class' => 'attachment',
+        return array(
+                     'class' => 'u-url',
                      'href' => $this->attachment->getAttachmentUrl(),
-                     'id' => 'attachment-' . $this->attachment->getID(),
                      'title' => $this->linkTitle());
     }
 
-    function showLink() {
-        $this->out->elementStart('a', $this->linkAttr());
-        $this->out->element('span', null, $this->linkTitle());
-        $this->showRepresentation();
-        $this->out->elementEnd('a');
-    }
-
     function showNoticeAttachment()
     {
-        $this->showLink();
+        $this->showRepresentation();
     }
 
     function showRepresentation() {
         $enclosure = $this->attachment->getEnclosure();
 
         if (Event::handle('StartShowAttachmentRepresentation', array($this->out, $this->attachment))) {
+
+            $this->out->elementStart('label');
+            $this->out->element('a', $this->linkAttr(), $this->title());
+            $this->out->elementEnd('label');
+
             if (!empty($enclosure->mimetype)) {
                 // First, prepare a thumbnail if it exists.
                 $thumb = null;
diff --git a/lib/inlineattachmentlistitem.php b/lib/inlineattachmentlistitem.php
index 10b9db202b..5c918bb86e 100644
--- a/lib/inlineattachmentlistitem.php
+++ b/lib/inlineattachmentlistitem.php
@@ -31,11 +31,6 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class InlineAttachmentListItem extends AttachmentListItem
 {
-    function showLink() {
-        $this->out->element('a', $this->linkAttr(), $this->title());
-        $this->showRepresentation();
-    }
-
     /**
      * start a single notice.
      *
@@ -45,7 +40,10 @@ class InlineAttachmentListItem extends AttachmentListItem
     {
         // XXX: RDFa
         // TODO: add notice_type class e.g., notice_video, notice_image
-        $this->out->elementStart('li', array('class' => 'inline-attachment'));
+        $this->out->elementStart('li',
+                    array('class' => 'inline-attachment',
+                          'id' => 'attachment-' . $this->attachment->getID(),
+                ));
     }
 
     /**