diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index b72cb9218..b50b2720f 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -44,18 +44,35 @@ class MessagesController < ApplicationController
     end
 
     @reply_count = @topic.children.count
-    @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
-    @replies =  @topic.children.
-      includes(:author, :attachments, {:board => :project}).
-      reorder("#{Message.table_name}.created_on DESC").
-      limit(@reply_pages.per_page).
-      offset(@reply_pages.offset).
-      all
+    # @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
+    # @replies =  @topic.children.
+    #   includes(:author, :attachments, {:board => :project}).
+    #   reorder("#{Message.table_name}.created_on DESC").
+    #   limit(@reply_pages.per_page).
+    #   offset(@reply_pages.offset).
+    #   all
 
     @reply = Message.new(:subject => "RE: #{@message.subject}")
     if @course
+      messages_replies =  @topic.children.
+          includes(:author, :attachments, {:board => :project}).
+          reorder("#{Message.table_name}.created_on DESC").
+          #limit(@reply_pages.per_page).
+          #offset(@reply_pages.offset).
+          all
+      @replies = paginateHelper messages_replies,10
+      @reply = Message.new(:subject => "RE: #{@message.subject}")
       render :action => "show", :layout => "base_courses"#by young
     else
+      @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
+      @replies =  @topic.children.
+          includes(:author, :attachments, {:board => :project}).
+          reorder("#{Message.table_name}.created_on DESC").
+          limit(@reply_pages.per_page).
+          offset(@reply_pages.offset).
+          all
+
+      @reply = Message.new(:subject => "RE: #{@message.subject}")
       render :action => "show", :layout => "base_projects"#by young
     end
   end
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 344aa067d..e79913380 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -148,7 +148,9 @@
       <div id="preview" class="wiki"></div>
     </div>
 <% end %>
-
+<ul class="wlist">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+</ul>
 <% html_title @topic.subject %>
 
 <script type="text/javascript">