adding gateway id to messaging events