=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java	2012-12-13 12:48:11 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java	2012-12-15 11:23:03 +0000
@@ -217,10 +217,6 @@
         if ( !conversation.getUserMessages().isEmpty() )
         {
             int id = saveMessageConversation( conversation );
-
-
-            invokeMessageSenders( COMPLETE_SUBJECT, text, sender, conversation.getUsers() );
-
             
             invokeMessageSenders( COMPLETE_SUBJECT, text, sender, new HashSet<User>( conversation.getUsers() ) );
 
@@ -304,7 +300,7 @@
     {
         for ( MessageSender messageSender : messageSenders )
         {
-            messageSender.sendMessage( subject, text, sender, users, false );
+            messageSender.sendMessage( subject, text, sender, new HashSet<User>( users ), false );
         }
     }