diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
new file mode 100644
index 000000000..7071e9ccc
--- /dev/null
+++ b/app/views/comments/_comment.html.haml
@@ -0,0 +1,14 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+%li.comment{:data=>{:guid=>comment.id}}
+  %a{:href => "/people/#{person.id}"}
+    %img{:src => image_or_default(person), :class => "avatar", :alt => person.real_name, :title => person.real_name, "data-person_id" => person.id}
+  .content
+    .from
+      %a{:href => "/people/#{person.id}"}=person.real_name
+    = markdownify(comment.text, :youtube_maps => comment[:youtube_titles])
+    %div.time
+      = comment.created_at ? "#{time_ago_in_words(comment.created_at)} #{t('ago')}" : time_ago_in_words(Time.now)
+