diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 5d968dc47..1c5a75c91 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -14,7 +14,9 @@ class ExerciseController < ApplicationController
       exercise.update_column('exercise_status', 2)
       course = exercise.course
       course.members.each do |m|
-        exercise.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
+        if m.user_id != exercise.user_id
+          exercise.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
+        end
       end
     end
 
@@ -41,8 +43,10 @@ class ExerciseController < ApplicationController
     publish_exercises.each do |exercise|
       exercise.update_column('exercise_status', 2)
       course = exercise.course
-      course.members.each do |m|
-        exercise.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
+      if m.user_id != exercise.user_id
+        course.members.each do |m|
+          exercise.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
+        end
       end
     end
 
@@ -441,9 +445,6 @@ class ExerciseController < ApplicationController
     @exercise.exercise_status = 2
     @exercise.publish_time = Time.now
     if @exercise.save
-      @exercise.course.members.each do |m|
-         @exercise.course_messages << CourseMessage.create(:user_id =>m.user_id, :course_id => @exercise.course.id, :viewed => false,:status=>2)
-      end
       #redirect_to exercise_index_url(:course_id=> @course.id)
       respond_to do |format|
         format.js