fixes
manager-side fixes
Merge pull request #83 from BrandyMint/aleksxor/4214-conversations-journal

fixes