=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java 2011-12-16 11:36:58 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java 2011-12-16 14:00:10 +0000 @@ -159,13 +159,6 @@ @XmlElement @JsonProperty - public String getLastSenderName() - { - return lastSenderFirstname + " " + lastSenderSurname; - } - - @XmlElement - @JsonProperty public String getSubject() { return subject; @@ -229,8 +222,11 @@ this.read = read; } - @XmlElement - @JsonProperty + public String getLastSenderName() + { + return lastSenderFirstname + " " + lastSenderSurname; + } + public String getLastSenderSurname() { return lastSenderSurname; @@ -241,8 +237,6 @@ this.lastSenderSurname = lastSenderSurname; } - @XmlElement - @JsonProperty public String getLastSenderFirstname() { return lastSenderFirstname;