Adding host/port information to messages