diff --git a/lib/noticelist.php b/lib/noticelist.php
index aa6ea278c9..a106478edd 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -535,17 +535,19 @@ class NoticeListItem extends Widget
 
             $repeater = Profile::staticGet('id', $this->repeat->profile_id);
 
-            $attrs = array('href' => $repeater->profileurl,
+            $attrs = array('href' => $this->profile->profileurl,
                            'class' => 'url');
 
             if (!empty($repeater->fullname)) {
                 $attrs['title'] = $repeater->fullname . ' (' . $repeater->nickname . ')';
             }
 
-            $this->out->elementStart('span', 'repeat');
+            $this->out->elementStart('span', 'repeat vcard');
 
             $this->out->elementStart('a', $attrs);
 
+            $this->out->raw(_('Repeated by'));
+
             $avatar = $repeater->getAvatar(AVATAR_MINI_SIZE);
 
             $this->out->element('img', array('src' => ($avatar) ?
@@ -559,12 +561,9 @@ class NoticeListItem extends Widget
                                              $repeater->fullname :
                                              $repeater->nickname));
 
+            $this->out->element('span', 'nickname', $repeater->nickname);
             $this->out->elementEnd('a');
 
-            $text_link = XMLStringer::estring('a', $attrs, $repeater->nickname);
-
-            $this->out->raw(sprintf(_('Repeated by %s'), $text_link));
-
             $this->out->elementEnd('span');
         }
     }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index bab6431b9a..0173d2fbb2 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -982,6 +982,17 @@ font-size:1.025em;
 display:inline-block;
 }
 
+.entry-content .repeat {
+display:block;
+}
+.entry-content .repeat .photo {
+float:none;
+margin-right:1px;
+position:relative;
+top:4px;
+left:0;
+}
+
 .notice-options {
 position:relative;
 font-size:0.95em;