refactoring deliverypath, unneeded parameters origin and destination,
already inside the mail object
Merge branch 'local'