diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 3cf43c723..eb97c4123 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -1,6 +1,6 @@
 %li.comment{:id => comment.id} 
   %span.from
     = link_to_person comment.person
-    = comment.text
+    = auto_link comment.text
   %div.time
     = "#{time_ago_in_words(comment.updated_at)} ago"
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index e058eb5fb..f90687e61 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -1,7 +1,7 @@
 %li.message{:id => post.id, :class => ("mine" if mine?(post))}
   %span.from
     = link_to_person post.person
-    = post.message
+    = auto_link post.message
     
   %div.time
     = link_to(how_long_ago(post), status_message_path(post))