=== 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	2015-06-08 10:05:46 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/MessageConversation.hbm.xml	2015-06-08 10:30:59 +0000
@@ -34,11 +34,12 @@
     </list>
 
     <many-to-one name="lastSender" class="org.hisp.dhis.user.User" column="lastsenderid"
-      foreign-key="fk_messageconversation_userid" />
+      foreign-key="fk_messageconversation_lastsender_userid" />
 
     <property name="lastMessage" column="lastmessage" index="messageconversation_lastmessage" />
 
-	<many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_messageconversation_userid" />
+	<many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" 
+	  foreign-key="fk_messageconversation_user_userid" />
 	
   </class>
 </hibernate-mapping>