Merge WIP branch for email trade offer #13

Closed
thisfro wants to merge 1 commit from master into wip-email

Diff content is not available