Code cleanup
Added show vendor on all emails #29

#changelog