Improve success/failure emails