=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/Message.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/Message.hbm.xml	2011-03-31 15:54:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/Message.hbm.xml	2011-04-01 07:32:03 +0000
@@ -12,9 +12,9 @@
       <generator class="native"/>
     </id>
 
-	<property name="key" column="key" not-null="true"/>
-    <property name="subject" column="subject" not-null="true"/>
-    <property name="text" column="text"/>
+	<property name="key" column="messagekey" not-null="true"/>
+    <property name="subject" column="messagesubject" not-null="true"/>
+    <property name="text" column="messagetext"/>
         
     <many-to-one name="sender" class="org.hisp.dhis.user.User" 
       column="userid" foreign-key="fk_message_user" not-null="true"/>

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/UserMessage.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/UserMessage.hbm.xml	2011-03-31 15:54:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/UserMessage.hbm.xml	2011-04-01 07:32:03 +0000
@@ -15,7 +15,7 @@
     <many-to-one name="user" class="org.hisp.dhis.user.User" 
       column="userid" foreign-key="fk_usermessage_user" not-null="true"/>
     
-    <property name="read" column="read" not-null="true"/>    
+    <property name="read" column="canread" not-null="true"/>    
     <property name="messageDate" column="messageDate" not-null="true"/>
     
     <join table="message_usermessages" inverse="true">