diff --git a/actions/showstream.php b/actions/showstream.php
index 8f06d60e6c..c4061da4fd 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -360,10 +360,18 @@ class ShowstreamAction extends StreamAction {
 		common_raw(common_render_content($notice->content, $notice));
 		common_element_end('p');
 		common_element_start('p', array('class' => 'time'));
-		common_element('a', array('class' => 'notice',
-								  'href' => $noticeurl),
+		common_element('a', array('class' => 'permalink',
+								  'href' => $noticeurl,
+								  'title' => common_exact_date($notice->created)),
 					   common_date_string($notice->created));
 		common_element_end('p');
+		common_element_start('a', 
+							 array('href' => common_local_url('newnotice',
+															  array('replyto' => $profile->nickname)),
+								   'onclick' => 'doreply("'.$profile->nickname.'"); return false',
+								   'title' => _t('reply'),
+								   'class' => 'replybutton'));
+		common_raw('→');
 		common_element_end('li');
 	}
-}
+}
\ No newline at end of file
diff --git a/lib/stream.php b/lib/stream.php
index 431580b136..c13be22849 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -101,8 +101,8 @@ class StreamAction extends Action {
 								   'title' => _t('reply'),
 								   'class' => 'replybutton'));
 		common_raw('→');
-		common_element_end('a');
 		common_element_end('p');
+		common_element_end('a');
 		common_element_end('li');
 	}
 }