diff --git a/actions/conversation.php b/actions/conversation.php
index 20c68986cb..d3fc5b6a9c 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -217,6 +217,8 @@ class ConversationTree extends NoticeList
 
             $this->out->elementStart('ol', array('class' => 'notices'));
 
+            sort($children);
+
             foreach ($children as $child) {
                 $this->showNoticePlus($child);
             }
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index e1726df287..c80c0c418f 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -243,6 +243,42 @@ class AttachmentListItem extends Widget
 
 class Attachment extends AttachmentListItem
 {
+    function showLink() {
+        $this->out->elementStart('a', $this->linkAttr());
+        $this->out->element('span', null, $this->linkTitle());
+        $this->showRepresentation();
+        $this->out->elementEnd('a');
+
+        if (empty($this->oembed->author_name) && empty($this->oembed->provider)) {
+            return;
+        }
+
+        $this->out->elementStart('dl', 'oembed_info');
+        
+        if (!empty($this->oembed->author_name)) {
+            $this->out->element('dt', null, _('Author:'));
+
+            $this->out->elementStart('dd');
+            if (empty($this->oembed->author_url)) {
+                $this->out->text($this->oembed->author_name);
+            } else {
+                $this->out->element('a', array('href' => $this->oembed->author_url), $this->oembed->author_name);
+            }
+            $this->out->elementEnd('dd');
+        }
+        if (!empty($this->oembed->provider)) {
+            $this->out->element('dt', null, _('Provider:'));
+            $this->out->elementStart('dd');
+            if (empty($this->oembed->provider_url)) {
+                $this->out->text($this->oembed->provider);
+            } else {
+                $this->out->element('a', array('href' => $this->oembed->provider_url), $this->oembed->provider);
+            }
+            $this->out->elementEnd('dd');
+        }
+        $this->out->elementEnd('dl');
+    }
+
     function show() {
         $this->showNoticeAttachment();
     }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d6ecef2fcc..daf5ada1c5 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1284,3 +1284,9 @@ display:none;
 .guide {
 clear:both;
 }
+
+dl.oembed_info dt,
+dl.oembed_info dd {
+display: inline;
+}
+