Fixing mail forward using message isntead of delivery.