Fix payment_gateway handling in inbox