=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2012-02-15 17:10:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2012-02-15 17:26:35 +0000
@@ -321,7 +321,6 @@
executeSql( "ALTER TABLE messageconversation DROP COLUMN messageconversationkey" );
executeSql( "UPDATE messageconversation SET lastmessage=lastupdated WHERE lastmessage is null" );
- executeSql( "ALTER TABLE messageconversation DROP COLUMN lastupdated" );
executeSql( "ALTER TABLE message DROP COLUMN messagesubject" );
executeSql( "ALTER TABLE message DROP COLUMN messagekey" );
executeSql( "ALTER TABLE message DROP COLUMN sentdate" );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/MessageConversation.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/MessageConversation.hbm.xml 2012-02-15 17:10:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/MessageConversation.hbm.xml 2012-02-15 17:26:35 +0000
@@ -13,6 +13,7 @@