Applying Istvan's fix

changes emails pulled to include billing ones for orders.