6 files changed, 17 insertions, 16 deletions
diff --git a/app/views/discussions/_form.html.haml b/app/views/inboxes/discussions/_form.html.haml
index 303f0bb..303f0bb 100644
--- a/app/views/discussions/_form.html.haml
+++ b/app/views/inboxes/discussions/_form.html.haml
diff --git a/app/views/discussions/index.html.haml b/app/views/inboxes/discussions/index.html.haml
index 8060254..7c4de6e 100644
--- a/app/views/discussions/index.html.haml
+++ b/app/views/inboxes/discussions/index.html.haml
@@ -1,5 +1,6 @@
 %h1 Discussions list
-
+%p
+  Unread messages: 
 %table
   %tr
     %th Last message
diff --git a/app/views/discussions/new.html.haml b/app/views/inboxes/discussions/new.html.haml
index 6bcf481..6bcf481 100644
--- a/app/views/discussions/new.html.haml
+++ b/app/views/inboxes/discussions/new.html.haml
diff --git a/app/views/discussions/show.html.haml b/app/views/inboxes/discussions/show.html.haml
index e25d0a2..a910b51 100644
--- a/app/views/discussions/show.html.haml
+++ b/app/views/inboxes/discussions/show.html.haml
@@ -1,3 +1,6 @@
+- if Inboxes::config.faye_enabled
+  = javascript_include_tag "messaging"
+
 %h1 Discussion
 
 %h3
@@ -17,22 +20,11 @@
   
 %h3 Messages
 
-%table
-  %tr
-    %th User
-    %th Message
-    %th Posted at
-  - @discussion.messages.each do |message|
-    %tr
-      %td
-        = message.user[Inboxes::config.user_name]
-      %td
-        = message.body
-      %td
-        = l(message.created_at)
-
+#messages_box
+  = render @discussion.messages, :as => :message
+  
 %h3 Add message
-= render "messages/form"
+= render "inboxes/messages/form"
 
 %p
   = link_to "Leave discussion", discussion_speaker_path(@discussion, @discussion.find_speaker_by_user(current_user)), :method => :delete unless @discussion.private?
diff --git a/app/views/messages/_form.html.haml b/app/views/inboxes/messages/_form.html.haml
index f85ed37..f85ed37 100644
--- a/app/views/messages/_form.html.haml
+++ b/app/views/inboxes/messages/_form.html.haml
diff --git a/app/views/inboxes/messages/_message.html.haml b/app/views/inboxes/messages/_message.html.haml
new file mode 100644
index 0000000..639f130
--- /dev/null
+++ b/app/views/inboxes/messages/_message.html.haml
@@ -0,0 +1,8 @@
+.message
+  %p
+    %span
+      = message.user[Inboxes::config.user_name]
+      @
+      = l(message.created_at)
+      =":"
+    %b= message.body
+\ No newline at end of file