Card #242 fix for duplicate message on add message (hibernate issue)
Card #242 fix for conversation controller test