=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageSender.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageSender.java	2011-09-30 17:01:57 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageSender.java	2011-10-25 10:29:21 +0000
@@ -42,5 +42,5 @@
      * @param message the message to send.
      * @param users the users to send the message to.
      */
-    void sendMessage( String subject, String text, Set<User> users );
+    void sendMessage( String subject, String text, User sender, Set<User> users );
 }

=== 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	2011-10-07 14:11:37 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java	2011-10-25 10:29:21 +0000
@@ -111,7 +111,7 @@
         
         int id = saveMessageConversation( conversation );
         
-        invokeMessageSenders( subject, text, users );
+        invokeMessageSenders( subject, text, sender, users );
         
         return id;
     }
@@ -131,7 +131,7 @@
         
         updateMessageConversation( conversation );
         
-        invokeMessageSenders( conversation.getSubject(), text, conversation.getUsers() );
+        invokeMessageSenders( conversation.getSubject(), text, sender, conversation.getUsers() );
     }
 
     public int sendCompletenessMessage( CompleteDataSetRegistration registration )
@@ -158,7 +158,7 @@
             
             int id = saveMessageConversation( conversation );
             
-            invokeMessageSenders( subject, text, userGroup.getMembers() );
+            invokeMessageSenders( subject, text, sender, userGroup.getMembers() );
             
             return id;
         }
@@ -200,11 +200,11 @@
     // Supportive methods
     // -------------------------------------------------------------------------
 
-    private void invokeMessageSenders( String subject, String text, Set<User> users )
+    private void invokeMessageSenders( String subject, String text, User sender, Set<User> users )
     {
-        for ( MessageSender sender : messageSenders )
+        for ( MessageSender messageSender : messageSenders )
         {
-            sender.sendMessage( subject, text, users );
+            messageSender.sendMessage( subject, text, sender, users );
         }
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java	2011-10-24 16:42:44 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java	2011-10-25 10:29:21 +0000
@@ -83,7 +83,7 @@
     // -------------------------------------------------------------------------
 
     @Override
-    public void sendMessage( String subject, String text, Set<User> users )
+    public void sendMessage( String subject, String text, User sender, Set<User> users )
     {
         String hostName = StringUtils.trimToNull( (String) systemSettingManager.getSystemSetting( KEY_EMAIL_HOST_NAME ) );
         String username = StringUtils.trimToNull( (String) systemSettingManager.getSystemSetting( KEY_EMAIL_USERNAME ) );
@@ -93,6 +93,12 @@
         {
             return;
         }
+
+        text = sender == null ? text : ( text + LB + LB + 
+            sender.getName() + LB + 
+            sender.getOrganisationUnitsName() + LB +
+            ( sender.getEmail() != null ? ( sender.getEmail() + LB ) : StringUtils.EMPTY ) +
+            ( sender.getPhoneNumber() != null ? ( sender.getPhoneNumber() + LB ) : StringUtils.EMPTY ) );
         
         Map<User,Serializable> settings = userService.getUserSettings( KEY_MESSAGE_EMAIL_NOTIFICATION, false );
         
@@ -104,17 +110,11 @@
             {
                 try
                 {
-                    String message = text + LB + LB + 
-                        user.getName() + LB + 
-                        user.getOrganisationUnitsName() + LB +
-                        ( user.getEmail() != null ? ( user.getEmail() + LB ) : StringUtils.EMPTY ) +
-                        ( user.getPhoneNumber() != null ? ( user.getPhoneNumber() + LB ) : StringUtils.EMPTY );
-                    
                     String toAddress = StringUtils.trimToNull( user.getEmail() );
                     
                     Email email = getEmail( hostName, username, password );
                     email.setSubject( SUBJECT_PREFX + subject );
-                    email.setMsg( message );
+                    email.setMsg( text );
                     email.addTo( toAddress );
                     email.send();
                     

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/message/MockMessageSender.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/message/MockMessageSender.java	2011-09-30 17:01:57 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/message/MockMessageSender.java	2011-10-25 10:29:21 +0000
@@ -35,7 +35,7 @@
     implements MessageSender
 {
     @Override
-    public void sendMessage( String subject, String text, Set<User> users )
+    public void sendMessage( String subject, String text, User sender, Set<User> users )
     {
         // Do nothing
     }