Properly implemented cleanup of message with contacts and session merge.