diff --git a/plugins/messages/app/models/message.rb b/plugins/messages/app/models/message.rb
index e61528fd..12f904c9 100644
--- a/plugins/messages/app/models/message.rb
+++ b/plugins/messages/app/models/message.rb
@@ -35,7 +35,7 @@ class Message < ActiveRecord::Base
   def clean_up_recipient_ids
     add_recipients Group.find(group_id).users unless group_id.blank?
     self.recipients_ids = recipients_ids.uniq.reject { |id| id.blank? } unless recipients_ids.nil?
-    self.recipients_ids = User.all.collect(&:id) if send_to_all == "1"
+    self.recipients_ids = User.undeleted.collect(&:id) if send_to_all == "1"
   end
 
   def add_recipients(users)