diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index b1da35cfc..a242587fb 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -37,6 +37,14 @@ class MessagesController < ApplicationController
 
   # Show a topic and its replies
   def show
+    if @course
+      topic_id = params[:r]?params[:r]:params[:id]
+      parent_id = params[:id]
+      url = course_boards_path(@course,:topic_id => topic_id,:parent_id=>parent_id);
+      redirect_to url
+      return;
+    end
+
     @isReply = true
     page = params[:page]
     # Find the page of the requested reply