Fixed issue with message expiration