Fix messaging bug (new/old)