Quick fix to get conversation and message saving