=== 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	2015-04-23 12:28:34 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java	2015-04-23 14:04:50 +0000
@@ -318,8 +318,10 @@
             return null;
         }
 
-        mc.setFollowUp( mc.isFollowUp( currentUserService.getCurrentUser() ) );
-        mc.setRead( mc.isRead( currentUserService.getCurrentUser() ) );
+        User user = currentUserService.getCurrentUser();
+
+        mc.setFollowUp( mc.isFollowUp( user ) );
+        mc.setRead( mc.isRead( user ) );
 
         return messageConversationStore.getByUid( uid );
     }