Fixing wrong session storage / restoring in Messages